diff options
| author | avg <avg@FreeBSD.org> | 2017-10-01 14:50:01 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2017-10-01 14:50:01 +0000 |
| commit | f3ddf0f93c89dc9578ebf10214ced1ec97266d0a (patch) | |
| tree | 69dbf236034ed3556634ecebffae27f6862451eb | |
| parent | 077fa770da2b99a6391859d84754c45906182c50 (diff) | |
| download | FreeBSD-src-f3ddf0f93c89dc9578ebf10214ced1ec97266d0a.zip FreeBSD-src-f3ddf0f93c89dc9578ebf10214ced1ec97266d0a.tar.gz | |
MFC r323522: slightly simplify zfs_vptocnp
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c index f894435..1d9e691 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c @@ -5924,7 +5924,6 @@ zfs_vptocnp(struct vop_vptocnp_args *ap) vnode_t *vp = ap->a_vp;; zfsvfs_t *zfsvfs = vp->v_vfsp->vfs_data; znode_t *zp = VTOZ(vp); - uint64_t parent; int ltype; int error; @@ -5935,13 +5934,7 @@ zfs_vptocnp(struct vop_vptocnp_args *ap) * If we are a snapshot mounted under .zfs, run the operation * on the covered vnode. */ - if ((error = sa_lookup(zp->z_sa_hdl, - SA_ZPL_PARENT(zfsvfs), &parent, sizeof (parent))) != 0) { - ZFS_EXIT(zfsvfs); - return (error); - } - - if (zp->z_id != parent || zfsvfs->z_parent == zfsvfs) { + if (zp->z_id != zfsvfs->z_root || zfsvfs->z_parent == zfsvfs) { char name[MAXNAMLEN + 1]; znode_t *dzp; size_t len; |
