diff options
| author | Christoph Hellwig <hch@sgi.com> | 2005-09-02 16:46:51 +1000 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2005-09-02 16:46:51 +1000 |
| commit | 0432dab2d2d3b35347a95c01c78a40781b6431fb (patch) | |
| tree | 44fa8c13d6300c9c42b9f5a60aeb933131e24e67 /fs/xfs/xfs_acl.c | |
| parent | 155ffd075caedcea5ad595c95403c71bfc391c4a (diff) | |
| download | linux-0432dab2d2d3b35347a95c01c78a40781b6431fb.tar.gz linux-0432dab2d2d3b35347a95c01c78a40781b6431fb.tar.bz2 linux-0432dab2d2d3b35347a95c01c78a40781b6431fb.zip | |
[XFS] remove struct vnode::v_type
SGI-PV: 936236
SGI-Modid: xfs-linux:xfs-kern:195878a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_acl.c')
| -rw-r--r-- | fs/xfs/xfs_acl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c index 8d01dce8c532..92fd1d67f878 100644 --- a/fs/xfs/xfs_acl.c +++ b/fs/xfs/xfs_acl.c @@ -85,7 +85,7 @@ xfs_acl_vhasacl_default( { int error; - if (vp->v_type != VDIR) + if (!VN_ISDIR(vp)) return 0; xfs_acl_get_attr(vp, NULL, _ACL_TYPE_DEFAULT, ATTR_KERNOVAL, &error); return (error == 0); @@ -389,7 +389,7 @@ xfs_acl_allow_set( if (vp->v_inode.i_flags & (S_IMMUTABLE|S_APPEND)) return EPERM; - if (kind == _ACL_TYPE_DEFAULT && vp->v_type != VDIR) + if (kind == _ACL_TYPE_DEFAULT && !VN_ISDIR(vp)) return ENOTDIR; if (vp->v_vfsp->vfs_flag & VFS_RDONLY) return EROFS; @@ -750,7 +750,7 @@ xfs_acl_inherit( * If the new file is a directory, its default ACL is a copy of * the containing directory's default ACL. */ - if (vp->v_type == VDIR) + if (VN_ISDIR(vp)) xfs_acl_set_attr(vp, pdaclp, _ACL_TYPE_DEFAULT, &error); if (!error && !basicperms) xfs_acl_set_attr(vp, cacl, _ACL_TYPE_ACCESS, &error); |