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

[Martin Matuska]

Author: mm
Date: Tue Sep 14 12:12:18 2010
New Revision: 212611
URL: http://svn.freebsd.org/changeset/base/212611

Log:
  Remove duplicated VFS_HOLD due to a mismerge.
  
  PR:		kern/150544
  Approved by:	delphij (mentor)
  MFC after:	1 day

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

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	Tue Sep 14 12:12:07 2010	(r212610)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	Tue Sep 14 12:12:18 2010	(r212611)
@@ -1226,13 +1226,6 @@ zfs_mount(vfs_t *vfsp)
 	if (error == 0 && ((zfsvfs_t *)vfsp->vfs_data)->z_issnap)
 		VFS_HOLD(mvp->v_vfsp);
 
-	/*
-	 * Add an extra VFS_HOLD on our parent vfs so that it can't
-	 * disappear due to a forced unmount.
-	 */
-	if (error == 0 && ((zfsvfs_t *)vfsp->vfs_data)->z_issnap)
-		VFS_HOLD(mvp->v_vfsp);
-
 out:
 	return (error);
 }