aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/acl.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/btrfs/acl.c')
-rw-r--r--fs/btrfs/acl.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index 2222d161c7b6..cb518a4b917c 100644
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -185,13 +185,15 @@ static int btrfs_xattr_acl_set(struct dentry *dentry, const char *name,
185 return ret; 185 return ret;
186} 186}
187 187
188int btrfs_check_acl(struct inode *inode, int mask) 188int btrfs_check_acl(struct inode *inode, int mask, unsigned int flags)
189{ 189{
190 struct posix_acl *acl; 190 struct posix_acl *acl;
191 int error = -EAGAIN; 191 int error = -EAGAIN;
192 192
193 acl = btrfs_get_acl(inode, ACL_TYPE_ACCESS); 193 if (flags & IPERM_FLAG_RCU)
194 return -ECHILD;
194 195
196 acl = btrfs_get_acl(inode, ACL_TYPE_ACCESS);
195 if (IS_ERR(acl)) 197 if (IS_ERR(acl))
196 return PTR_ERR(acl); 198 return PTR_ERR(acl);
197 if (acl) { 199 if (acl) {