svn commit: r302772 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Andriy Gapon]

Author: avg
Date: Wed Jul 13 15:16:51 2016
New Revision: 302772
URL: https://svnweb.freebsd.org/changeset/base/302772

Log:
  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.
  
  MFC after:	5 days

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c	Wed Jul 13 14:59:17 2016	(r302771)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c	Wed Jul 13 15:16:51 2016	(r302772)
@@ -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);