Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 226734
b: refs/heads/master
c: 880566e
h: refs/heads/master
v: v3
  • Loading branch information
Nick Piggin committed Jan 7, 2011
1 parent d23611e commit 34e8083
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 258a5aa8dfc6294f5f7df892023ee4d3e57c9841
refs/heads/master: 880566e17c4fce0d998d92610d32fcb9506aa6dd
9 changes: 6 additions & 3 deletions trunk/fs/xfs/linux-2.6/xfs_acl.c
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,6 @@ xfs_check_acl(struct inode *inode, int mask, unsigned int flags)
struct posix_acl *acl;
int error = -EAGAIN;

if (flags & IPERM_FLAG_RCU)
return -ECHILD;

ip = XFS_I(inode);
trace_xfs_check_acl(ip);

Expand All @@ -238,6 +235,12 @@ xfs_check_acl(struct inode *inode, int mask, unsigned int flags)
if (!XFS_IFORK_Q(ip))
return -EAGAIN;

if (flags & IPERM_FLAG_RCU) {
if (!negative_cached_acl(inode, ACL_TYPE_ACCESS))
return -ECHILD;
return -EAGAIN;
}

acl = xfs_get_acl(inode, ACL_TYPE_ACCESS);
if (IS_ERR(acl))
return PTR_ERR(acl);
Expand Down

0 comments on commit 34e8083

Please sign in to comment.