Author: avg
Date: Sun Oct 1 14:50:58 2017
New Revision: 324159
URL: https://svnweb.freebsd.org/changeset/base/324159
Log:
MFC r323522: slightly simplify zfs_vptocnp
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Sun Oct 1 14:50:01 2017 (r324158)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Sun Oct 1 14:50:58 2017 (r324159)
@@ -5963,7 +5963,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;
@@ -5974,13 +5973,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;
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
