diff options
author | Christoph Hellwig <hch@infradead.org> | 2007-08-28 21:44:18 -0400 |
---|---|---|
committer | Tim Shimmin <tes@chook.melbourne.sgi.com> | 2007-10-15 21:23:43 -0400 |
commit | 2f6f7b3d9b5600e1f6e7622c62ab30f36bd0f57f (patch) | |
tree | 06fe541eb0b90227a8a433d8e3cf66d621df7038 /fs/xfs/xfs_acl.c | |
parent | 739bfb2a7dfa369324f74aad1d020d6e0775e4f0 (diff) |
[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.c | 5 |
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( | |||
372 | bhv_vnode_t *vp, | 372 | bhv_vnode_t *vp, |
373 | int kind) | 373 | int kind) |
374 | { | 374 | { |
375 | xfs_inode_t *ip = xfs_vtoi(vp); | ||
375 | bhv_vattr_t va; | 376 | bhv_vattr_t va; |
376 | int error; | 377 | int error; |
377 | 378 | ||
@@ -379,10 +380,10 @@ xfs_acl_allow_set( | |||
379 | return EPERM; | 380 | return EPERM; |
380 | if (kind == _ACL_TYPE_DEFAULT && !VN_ISDIR(vp)) | 381 | if (kind == _ACL_TYPE_DEFAULT && !VN_ISDIR(vp)) |
381 | return ENOTDIR; | 382 | return ENOTDIR; |
382 | if (vp->v_vfsp->vfs_flag & VFS_RDONLY) | 383 | if (vp->v_inode.i_sb->s_flags & MS_RDONLY) |
383 | return EROFS; | 384 | return EROFS; |
384 | va.va_mask = XFS_AT_UID; | 385 | va.va_mask = XFS_AT_UID; |
385 | error = xfs_getattr(xfs_vtoi(vp), &va, 0); | 386 | error = xfs_getattr(ip, &va, 0); |
386 | if (error) | 387 | if (error) |
387 | return error; | 388 | return error; |
388 | if (va.va_uid != current->fsuid && !capable(CAP_FOWNER)) | 389 | if (va.va_uid != current->fsuid && !capable(CAP_FOWNER)) |