diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 22:30:19 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-25 14:23:39 -0400 |
commit | e77819e57f0817c6dc7cadd061acd70c604cbce2 (patch) | |
tree | f5d7aba2dfbb747a97d783b7cc6a486922c42559 /fs/ext2/acl.c | |
parent | 3ca30d40a91fb9b9871e61d5dea2c1a895906a15 (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/ext2/acl.c')
-rw-r--r-- | fs/ext2/acl.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c index bfe651f9ae16..ced1c478ebdb 100644 --- a/fs/ext2/acl.c +++ b/fs/ext2/acl.c | |||
@@ -236,12 +236,6 @@ ext2_check_acl(struct inode *inode, int mask) | |||
236 | { | 236 | { |
237 | struct posix_acl *acl; | 237 | struct posix_acl *acl; |
238 | 238 | ||
239 | if (mask & MAY_NOT_BLOCK) { | ||
240 | if (!negative_cached_acl(inode, ACL_TYPE_ACCESS)) | ||
241 | return -ECHILD; | ||
242 | return -EAGAIN; | ||
243 | } | ||
244 | |||
245 | acl = ext2_get_acl(inode, ACL_TYPE_ACCESS); | 239 | acl = ext2_get_acl(inode, ACL_TYPE_ACCESS); |
246 | if (IS_ERR(acl)) | 240 | if (IS_ERR(acl)) |
247 | return PTR_ERR(acl); | 241 | return PTR_ERR(acl); |