diff options
author | Nick Piggin <npiggin@kernel.dk> | 2011-01-07 01:49:58 -0500 |
---|---|---|
committer | Nick Piggin <npiggin@kernel.dk> | 2011-01-07 01:50:29 -0500 |
commit | b74c79e99389cd79b31fcc08f82c24e492e63c7e (patch) | |
tree | 763c6b412517306670bc625e90035f2d16bb739f /fs/generic_acl.c | |
parent | 34286d6662308d82aed891852d04c7c3a2649b16 (diff) |
fs: provide rcu-walk aware permission i_ops
Signed-off-by: Nick Piggin <npiggin@kernel.dk>
Diffstat (limited to 'fs/generic_acl.c')
-rw-r--r-- | fs/generic_acl.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/generic_acl.c b/fs/generic_acl.c index 6bc9e3a5a693..628004282130 100644 --- a/fs/generic_acl.c +++ b/fs/generic_acl.c | |||
@@ -190,10 +190,14 @@ generic_acl_chmod(struct inode *inode) | |||
190 | } | 190 | } |
191 | 191 | ||
192 | int | 192 | int |
193 | generic_check_acl(struct inode *inode, int mask) | 193 | generic_check_acl(struct inode *inode, int mask, unsigned int flags) |
194 | { | 194 | { |
195 | struct posix_acl *acl = get_cached_acl(inode, ACL_TYPE_ACCESS); | 195 | struct posix_acl *acl; |
196 | |||
197 | if (flags & IPERM_FLAG_RCU) | ||
198 | return -ECHILD; | ||
196 | 199 | ||
200 | acl = get_cached_acl(inode, ACL_TYPE_ACCESS); | ||
197 | if (acl) { | 201 | if (acl) { |
198 | int error = posix_acl_permission(inode, acl, mask); | 202 | int error = posix_acl_permission(inode, acl, mask); |
199 | posix_acl_release(acl); | 203 | posix_acl_release(acl); |