summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_acl.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2007-08-29 11:44:18 +1000
committerTim Shimmin <tes@chook.melbourne.sgi.com>2007-10-16 11:23:43 +1000
commit2f6f7b3d9b5600e1f6e7622c62ab30f36bd0f57f (patch)
tree06fe541eb0b90227a8a433d8e3cf66d621df7038 /fs/xfs/xfs_acl.c
parent739bfb2a7dfa369324f74aad1d020d6e0775e4f0 (diff)
downloadlinux-2f6f7b3d9b5600e1f6e7622c62ab30f36bd0f57f.tar.bz2
[XFS] kill v_vfsp member from struct bhv_vnode
We can easily get at the vfsp through the super_block but it will soon be gone anyway. SGI-PV: 969608 SGI-Modid: xfs-linux-melb:xfs-kern:29494a Signed-off-by: Christoph Hellwig <hch@infradead.org> Signed-off-by: David Chinner <dgc@sgi.com> Signed-off-by: Tim Shimmin <tes@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_acl.c')
-rw-r--r--fs/xfs/xfs_acl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c
index 034c5ea80dd1..817d9e93c2c5 100644
--- a/fs/xfs/xfs_acl.c
+++ b/fs/xfs/xfs_acl.c
@@ -372,6 +372,7 @@ xfs_acl_allow_set(
bhv_vnode_t *vp,
int kind)
{
+ xfs_inode_t *ip = xfs_vtoi(vp);
bhv_vattr_t va;
int error;
@@ -379,10 +380,10 @@ xfs_acl_allow_set(
return EPERM;
if (kind == _ACL_TYPE_DEFAULT && !VN_ISDIR(vp))
return ENOTDIR;
- if (vp->v_vfsp->vfs_flag & VFS_RDONLY)
+ if (vp->v_inode.i_sb->s_flags & MS_RDONLY)
return EROFS;
va.va_mask = XFS_AT_UID;
- error = xfs_getattr(xfs_vtoi(vp), &va, 0);
+ error = xfs_getattr(ip, &va, 0);
if (error)
return error;
if (va.va_uid != current->fsuid && !capable(CAP_FOWNER))