aboutsummaryrefslogtreecommitdiffstats
path: root/fs/9p
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-22 22:30:19 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-07-25 14:23:39 -0400
commite77819e57f0817c6dc7cadd061acd70c604cbce2 (patch)
treef5d7aba2dfbb747a97d783b7cc6a486922c42559 /fs/9p
parent3ca30d40a91fb9b9871e61d5dea2c1a895906a15 (diff)
vfs: move ACL cache lookup into generic code
This moves logic for checking the cached ACL values from low-level filesystems into generic code. The end result is a streamlined ACL check that doesn't need to load the inode->i_op->check_acl pointer at all for the common cached case. The filesystems also don't need to check for a non-blocking RCU walk case in their acl_check() functions, because that is all handled at a VFS layer. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/9p')
-rw-r--r--fs/9p/acl.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/9p/acl.c b/fs/9p/acl.c
index 7350f53f3b51..8be87857605c 100644
--- a/fs/9p/acl.c
+++ b/fs/9p/acl.c
@@ -101,9 +101,6 @@ int v9fs_check_acl(struct inode *inode, int mask)
101 struct posix_acl *acl; 101 struct posix_acl *acl;
102 struct v9fs_session_info *v9ses; 102 struct v9fs_session_info *v9ses;
103 103
104 if (mask & MAY_NOT_BLOCK)
105 return -ECHILD;
106
107 v9ses = v9fs_inode2v9ses(inode); 104 v9ses = v9fs_inode2v9ses(inode);
108 if (((v9ses->flags & V9FS_ACCESS_MASK) != V9FS_ACCESS_CLIENT) || 105 if (((v9ses->flags & V9FS_ACCESS_MASK) != V9FS_ACCESS_CLIENT) ||
109 ((v9ses->flags & V9FS_ACL_MASK) != V9FS_POSIX_ACL)) { 106 ((v9ses->flags & V9FS_ACL_MASK) != V9FS_POSIX_ACL)) {