diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-02 19:45:47 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-02 19:45:47 -0400 |
| commit | 84695ffee7987ee1e581be4c4696e47e1a29403b (patch) | |
| tree | 78ca09a96ecd6a6b5f4fae744c381968635af68d /fs/namei.c | |
| parent | bf16200689118d19de1b8d2a3c314fc21f5dc7bb (diff) | |
| parent | ce23e640133484eebc20ca7b7668388213e11327 (diff) | |
| download | linux-84695ffee7987ee1e581be4c4696e47e1a29403b.tar.bz2 | |
Merge getxattr prototype change into work.lookups
The rest of work.xattr stuff isn't needed for this branch
Diffstat (limited to 'fs/namei.c')
| -rw-r--r-- | fs/namei.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/namei.c b/fs/namei.c index 1d9ca2d5dff6..bdcea8a018b8 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -265,7 +265,7 @@ static int check_acl(struct inode *inode, int mask) if (!acl) return -EAGAIN; /* no ->get_acl() calls in RCU mode... */ - if (acl == ACL_NOT_CACHED) + if (is_uncached_acl(acl)) return -ECHILD; return posix_acl_permission(inode, acl, mask & ~MAY_NOT_BLOCK); } @@ -2655,7 +2655,7 @@ struct dentry *lock_rename(struct dentry *p1, struct dentry *p2) return NULL; } - mutex_lock(&p1->d_inode->i_sb->s_vfs_rename_mutex); + mutex_lock(&p1->d_sb->s_vfs_rename_mutex); p = d_ancestor(p2, p1); if (p) { @@ -2682,7 +2682,7 @@ void unlock_rename(struct dentry *p1, struct dentry *p2) inode_unlock(p1->d_inode); if (p1 != p2) { inode_unlock(p2->d_inode); - mutex_unlock(&p1->d_inode->i_sb->s_vfs_rename_mutex); + mutex_unlock(&p1->d_sb->s_vfs_rename_mutex); } } EXPORT_SYMBOL(unlock_rename); |