diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 19:30:19 -0700 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-25 14:23:39 -0400 |
| commit | e77819e57f0817c6dc7cadd061acd70c604cbce2 (patch) | |
| tree | f5d7aba2dfbb747a97d783b7cc6a486922c42559 /fs/ocfs2 | |
| parent | 3ca30d40a91fb9b9871e61d5dea2c1a895906a15 (diff) | |
| download | linux-3.10-e77819e57f0817c6dc7cadd061acd70c604cbce2.tar.gz linux-3.10-e77819e57f0817c6dc7cadd061acd70c604cbce2.tar.bz2 linux-3.10-e77819e57f0817c6dc7cadd061acd70c604cbce2.zip | |
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/ocfs2')
| -rw-r--r-- | fs/ocfs2/acl.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/ocfs2/acl.c b/fs/ocfs2/acl.c index f4cf451ce6e..aff23e59b58 100644 --- a/fs/ocfs2/acl.c +++ b/fs/ocfs2/acl.c @@ -297,9 +297,6 @@ int ocfs2_check_acl(struct inode *inode, int mask) struct posix_acl *acl; int ret = -EAGAIN; - if (mask & MAY_NOT_BLOCK) - return -ECHILD; - osb = OCFS2_SB(inode->i_sb); if (!(osb->s_mount_opt & OCFS2_MOUNT_POSIX_ACL)) return ret; |