diff options
author | Nick Piggin <npiggin@kernel.dk> | 2011-01-07 01:50:00 -0500 |
---|---|---|
committer | Nick Piggin <npiggin@kernel.dk> | 2011-01-07 01:50:30 -0500 |
commit | 73598611ade7c85f0c3d52ba5130103f6709c6d3 (patch) | |
tree | 51b54051c2b41cb712db0c47b9e595dafc09c8f3 /fs | |
parent | 1e1743ebe35ec7e3c1fa732408358fbc614cbbe5 (diff) |
ext2,3,4: provide simple rcu-walk ACL implementation
This simple implementation just checks for no ACLs on the inode, and
if so, then the rcu-walk may proceed, otherwise fail it.
Signed-off-by: Nick Piggin <npiggin@kernel.dk>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ext2/acl.c | 7 | ||||
-rw-r--r-- | fs/ext3/acl.c | 7 | ||||
-rw-r--r-- | fs/ext4/acl.c | 7 |
3 files changed, 15 insertions, 6 deletions
diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c index dd9bb3f0c8d7..7b4180554a62 100644 --- a/fs/ext2/acl.c +++ b/fs/ext2/acl.c | |||
@@ -236,8 +236,11 @@ ext2_check_acl(struct inode *inode, int mask, unsigned int flags) | |||
236 | { | 236 | { |
237 | struct posix_acl *acl; | 237 | struct posix_acl *acl; |
238 | 238 | ||
239 | if (flags & IPERM_FLAG_RCU) | 239 | if (flags & IPERM_FLAG_RCU) { |
240 | return -ECHILD; | 240 | if (!negative_cached_acl(inode, ACL_TYPE_ACCESS)) |
241 | return -ECHILD; | ||
242 | return -EAGAIN; | ||
243 | } | ||
241 | 244 | ||
242 | acl = ext2_get_acl(inode, ACL_TYPE_ACCESS); | 245 | acl = ext2_get_acl(inode, ACL_TYPE_ACCESS); |
243 | if (IS_ERR(acl)) | 246 | if (IS_ERR(acl)) |
diff --git a/fs/ext3/acl.c b/fs/ext3/acl.c index 9e49da8302d3..e4fa49e6c539 100644 --- a/fs/ext3/acl.c +++ b/fs/ext3/acl.c | |||
@@ -244,8 +244,11 @@ ext3_check_acl(struct inode *inode, int mask, unsigned int flags) | |||
244 | { | 244 | { |
245 | struct posix_acl *acl; | 245 | struct posix_acl *acl; |
246 | 246 | ||
247 | if (flags & IPERM_FLAG_RCU) | 247 | if (flags & IPERM_FLAG_RCU) { |
248 | return -ECHILD; | 248 | if (!negative_cached_acl(inode, ACL_TYPE_ACCESS)) |
249 | return -ECHILD; | ||
250 | return -EAGAIN; | ||
251 | } | ||
249 | 252 | ||
250 | acl = ext3_get_acl(inode, ACL_TYPE_ACCESS); | 253 | acl = ext3_get_acl(inode, ACL_TYPE_ACCESS); |
251 | if (IS_ERR(acl)) | 254 | if (IS_ERR(acl)) |
diff --git a/fs/ext4/acl.c b/fs/ext4/acl.c index 373dcaeedba9..e0270d1f8d82 100644 --- a/fs/ext4/acl.c +++ b/fs/ext4/acl.c | |||
@@ -242,8 +242,11 @@ ext4_check_acl(struct inode *inode, int mask, unsigned int flags) | |||
242 | { | 242 | { |
243 | struct posix_acl *acl; | 243 | struct posix_acl *acl; |
244 | 244 | ||
245 | if (flags & IPERM_FLAG_RCU) | 245 | if (flags & IPERM_FLAG_RCU) { |
246 | return -ECHILD; | 246 | if (!negative_cached_acl(inode, ACL_TYPE_ACCESS)) |
247 | return -ECHILD; | ||
248 | return -EAGAIN; | ||
249 | } | ||
247 | 250 | ||
248 | acl = ext4_get_acl(inode, ACL_TYPE_ACCESS); | 251 | acl = ext4_get_acl(inode, ACL_TYPE_ACCESS); |
249 | if (IS_ERR(acl)) | 252 | if (IS_ERR(acl)) |