summaryrefslogtreecommitdiffstats
path: root/fs/jffs2/acl.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-28 12:29:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-08 11:09:04 -0700
commit18f4c644773bc8de1fd9c5182b30c231aafb94ef (patch)
treeb423bdb22304c6af3ad0f26b873e6081fafc8f01 /fs/jffs2/acl.h
parent1d5ccd1c422d7d292a9e45248aa36771900c6331 (diff)
downloadop-kernel-dev-18f4c644773bc8de1fd9c5182b30c231aafb94ef.zip
op-kernel-dev-18f4c644773bc8de1fd9c5182b30c231aafb94ef.tar.gz
jffs2/jfs/xfs: switch over to 'check_acl' rather than 'permission()'
This avoids an indirect call in the VFS for each path component lookup. Well, at least as long as you own the directory in question, and the ACL check is unnecessary. 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/jffs2/acl.h')
-rw-r--r--fs/jffs2/acl.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jffs2/acl.h b/fs/jffs2/acl.h
index fc929f2..f0ba63e 100644
--- a/fs/jffs2/acl.h
+++ b/fs/jffs2/acl.h
@@ -26,7 +26,7 @@ struct jffs2_acl_header {
#ifdef CONFIG_JFFS2_FS_POSIX_ACL
-extern int jffs2_permission(struct inode *, int);
+extern int jffs2_check_acl(struct inode *, int);
extern int jffs2_acl_chmod(struct inode *);
extern int jffs2_init_acl_pre(struct inode *, struct inode *, int *);
extern int jffs2_init_acl_post(struct inode *);
@@ -36,7 +36,7 @@ extern struct xattr_handler jffs2_acl_default_xattr_handler;
#else
-#define jffs2_permission (NULL)
+#define jffs2_check_acl (NULL)
#define jffs2_acl_chmod(inode) (0)
#define jffs2_init_acl_pre(dir_i,inode,mode) (0)
#define jffs2_init_acl_post(inode) (0)
OpenPOWER on IntegriCloud