summaryrefslogtreecommitdiffstats
path: root/fs/ext2/acl.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-28 12:12:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-08 11:09:04 -0700
commit1d5ccd1c422d7d292a9e45248aa36771900c6331 (patch)
tree6fa8e117697dcb42dfec026149dfea49325bed98 /fs/ext2/acl.h
parent6d848a488ad83cc3891bb274691118f45ce6aab9 (diff)
downloadlinux-1d5ccd1c422d7d292a9e45248aa36771900c6331.tar.bz2
ext[234]: move over to 'check_acl' permission model
Don't implement per-filesystem 'extX_permission()' functions that have to be called for every path component operation, and instead just expose the actual ACL checking so that the VFS layer can now do it for us. Reviewed-by: James Morris <jmorris@namei.org> Acked-by: Serge Hallyn <serue@us.ibm.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ext2/acl.h')
-rw-r--r--fs/ext2/acl.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext2/acl.h b/fs/ext2/acl.h
index ecefe478898f..3ff6cbb9ac44 100644
--- a/fs/ext2/acl.h
+++ b/fs/ext2/acl.h
@@ -54,13 +54,13 @@ static inline int ext2_acl_count(size_t size)
#ifdef CONFIG_EXT2_FS_POSIX_ACL
/* acl.c */
-extern int ext2_permission (struct inode *, int);
+extern int ext2_check_acl (struct inode *, int);
extern int ext2_acl_chmod (struct inode *);
extern int ext2_init_acl (struct inode *, struct inode *);
#else
#include <linux/sched.h>
-#define ext2_permission NULL
+#define ext2_check_acl NULL
#define ext2_get_acl NULL
#define ext2_set_acl NULL