aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/acl.c
diff options
context:
space:
mode:
authorNick Piggin <npiggin@kernel.dk>2011-01-07 01:50:01 -0500
committerNick Piggin <npiggin@kernel.dk>2011-01-07 01:50:30 -0500
commit258a5aa8dfc6294f5f7df892023ee4d3e57c9841 (patch)
tree101a4b9ee97f7d838b35a906244085873c599d19 /fs/btrfs/acl.c
parent73598611ade7c85f0c3d52ba5130103f6709c6d3 (diff)
btrfs: 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/btrfs/acl.c')
-rw-r--r--fs/btrfs/acl.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index cb518a4b917c..6ae2c8cac9d5 100644
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -187,18 +187,21 @@ static int btrfs_xattr_acl_set(struct dentry *dentry, const char *name,
187 187
188int btrfs_check_acl(struct inode *inode, int mask, unsigned int flags) 188int btrfs_check_acl(struct inode *inode, int mask, unsigned int flags)
189{ 189{
190 struct posix_acl *acl;
191 int error = -EAGAIN; 190 int error = -EAGAIN;
192 191
193 if (flags & IPERM_FLAG_RCU) 192 if (flags & IPERM_FLAG_RCU) {
194 return -ECHILD; 193 if (!negative_cached_acl(inode, ACL_TYPE_ACCESS))
194 error = -ECHILD;
195 195
196 acl = btrfs_get_acl(inode, ACL_TYPE_ACCESS); 196 } else {
197 if (IS_ERR(acl)) 197 struct posix_acl *acl;
198 return PTR_ERR(acl); 198 acl = btrfs_get_acl(inode, ACL_TYPE_ACCESS);
199 if (acl) { 199 if (IS_ERR(acl))
200 error = posix_acl_permission(inode, acl, mask); 200 return PTR_ERR(acl);
201 posix_acl_release(acl); 201 if (acl) {
202 error = posix_acl_permission(inode, acl, mask);
203 posix_acl_release(acl);
204 }
202 } 205 }
203 206
204 return error; 207 return error;