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/xfs/linux-2.6 | |
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/xfs/linux-2.6')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_acl.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/xfs/linux-2.6/xfs_acl.c b/fs/xfs/linux-2.6/xfs_acl.c index cac48fe22ad5..f6d065ac56b5 100644 --- a/fs/xfs/linux-2.6/xfs_acl.c +++ b/fs/xfs/linux-2.6/xfs_acl.c | |||
@@ -231,16 +231,12 @@ xfs_check_acl(struct inode *inode, int mask) | |||
231 | /* | 231 | /* |
232 | * If there is no attribute fork no ACL exists on this inode and | 232 | * If there is no attribute fork no ACL exists on this inode and |
233 | * we can skip the whole exercise. | 233 | * we can skip the whole exercise. |
234 | * | ||
235 | * FIXME! Fill the cache! Locking? | ||
234 | */ | 236 | */ |
235 | if (!XFS_IFORK_Q(ip)) | 237 | if (!XFS_IFORK_Q(ip)) |
236 | return -EAGAIN; | 238 | return -EAGAIN; |
237 | 239 | ||
238 | if (mask & MAY_NOT_BLOCK) { | ||
239 | if (!negative_cached_acl(inode, ACL_TYPE_ACCESS)) | ||
240 | return -ECHILD; | ||
241 | return -EAGAIN; | ||
242 | } | ||
243 | |||
244 | acl = xfs_get_acl(inode, ACL_TYPE_ACCESS); | 240 | acl = xfs_get_acl(inode, ACL_TYPE_ACCESS); |
245 | if (IS_ERR(acl)) | 241 | if (IS_ERR(acl)) |
246 | return PTR_ERR(acl); | 242 | return PTR_ERR(acl); |