Skip to content

Commit

Permalink
xfs: cache negative ACLs if there is no attribute fork
Browse files Browse the repository at this point in the history
Always set up a negative ACL cache entry if the inode doesn't have an
attribute fork.  That behaves much better than doing this check inside
->check_acl.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Christoph Hellwig authored and Al Viro committed Jul 25, 2011
1 parent ebbb0ef commit 6311b10
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
13 changes: 1 addition & 12 deletions fs/xfs/linux-2.6/xfs_acl.c
Original file line number Diff line number Diff line change
Expand Up @@ -221,21 +221,10 @@ xfs_set_acl(struct inode *inode, int type, struct posix_acl *acl)
int
xfs_check_acl(struct inode *inode, int mask)
{
struct xfs_inode *ip;
struct posix_acl *acl;
int error = -EAGAIN;

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

/*
* If there is no attribute fork no ACL exists on this inode and
* we can skip the whole exercise.
*
* FIXME! Fill the cache! Locking?
*/
if (!XFS_IFORK_Q(ip))
return -EAGAIN;
trace_xfs_check_acl(XFS_I(inode));

acl = xfs_get_acl(inode, ACL_TYPE_ACCESS);
if (IS_ERR(acl))
Expand Down
4 changes: 4 additions & 0 deletions fs/xfs/linux-2.6/xfs_iops.c
Original file line number Diff line number Diff line change
Expand Up @@ -1194,6 +1194,10 @@ xfs_setup_inode(
break;
}

/* if there is no attribute fork no ACL can exist on this inode */
if (!XFS_IFORK_Q(ip))
cache_no_acl(inode);

xfs_iflags_clear(ip, XFS_INEW);
barrier();

Expand Down

0 comments on commit 6311b10

Please sign in to comment.