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/gfs2/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/gfs2/acl.c')
-rw-r--r-- | fs/gfs2/acl.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c index 8ef1079f1665..48171f4c943d 100644 --- a/fs/gfs2/acl.c +++ b/fs/gfs2/acl.c | |||
@@ -80,12 +80,6 @@ int gfs2_check_acl(struct inode *inode, int mask) | |||
80 | struct posix_acl *acl; | 80 | struct posix_acl *acl; |
81 | int error; | 81 | int error; |
82 | 82 | ||
83 | if (mask & MAY_NOT_BLOCK) { | ||
84 | if (!negative_cached_acl(inode, ACL_TYPE_ACCESS)) | ||
85 | return -ECHILD; | ||
86 | return -EAGAIN; | ||
87 | } | ||
88 | |||
89 | acl = gfs2_acl_get(GFS2_I(inode), ACL_TYPE_ACCESS); | 83 | acl = gfs2_acl_get(GFS2_I(inode), ACL_TYPE_ACCESS); |
90 | if (IS_ERR(acl)) | 84 | if (IS_ERR(acl)) |
91 | return PTR_ERR(acl); | 85 | return PTR_ERR(acl); |