svn commit: r302994 - stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Andriy Gapon]

Author: avg
Date: Mon Jul 18 07:06:44 2016
New Revision: 302994
URL: https://svnweb.freebsd.org/changeset/base/302994

Log:
  MFC r302772: re-apply r299908: zfsctl_snapdir_lookup: clear VV_ROOT of
  snapshot's root
  
  The change has been undone in r301275 on the assumption that it was no
  longer required.  But that was incorrect, because in this case (and only
  in this case) the snapshot root vnode is looked up before z_parent is
  fixed up.
  
  Approved by:	re (delphij)

Modified:
  stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c	Mon Jul 18 07:03:39 2016	(r302993)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c	Mon Jul 18 07:06:44 2016	(r302994)
@@ -1125,6 +1125,7 @@ domount:
 		 */
 		ASSERT(VTOZ(*vpp)->z_zfsvfs != zfsvfs);
 		VTOZ(*vpp)->z_zfsvfs->z_parent = zfsvfs;
+		(*vpp)->v_flag &= ~VROOT;
 	}
 	ZFS_EXIT(zfsvfs);