From owner-svn-src-head@FreeBSD.ORG  Sat Nov 13 21:09:18 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BD488106566C;
	Sat, 13 Nov 2010 21:09:18 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AB7DC8FC13;
	Sat, 13 Nov 2010 21:09:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oADL9IhC059904;
	Sat, 13 Nov 2010 21:09:18 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oADL9Iuj059902;
	Sat, 13 Nov 2010 21:09:18 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201011132109.oADL9Iuj059902@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Sat, 13 Nov 2010 21:09:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215260 -
	head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Nov 2010 21:09:18 -0000

Author: mm
Date: Sat Nov 13 21:09:18 2010
New Revision: 215260
URL: http://svn.freebsd.org/changeset/base/215260

Log:
  Disable VFS_HOLD placed on mnt_vnodecovered during the mount of a snapshot
  and VFS_RELE on a non-existing hold on snapshot parent's z_vfs.
  
  This disables the changes from OpenSolaris onnv-revision 9234:bffdc4fc05c4
  (bug IDs: 6792139, 6794830) - not applicable to FreeBSD.
  
  This fixes the process hang if umounting a manually mounted snapshot.
  
  Reported by:	Alexander Zagrebin <alexz@visp.ru>
  Approved by:	delphij (mentor)
  MFC after:	1 week

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	Sat Nov 13 21:03:19 2010	(r215259)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	Sat Nov 13 21:09:18 2010	(r215260)
@@ -1218,12 +1218,14 @@ zfs_mount(vfs_t *vfsp)
 	error = zfs_domount(vfsp, osname);
 	PICKUP_GIANT();
 
+#ifdef sun
 	/*
 	 * 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);
+#endif	/* sun */
 
 out:
 	return (error);
@@ -1766,12 +1768,14 @@ zfs_freevfs(vfs_t *vfsp)
 {
 	zfsvfs_t *zfsvfs = vfsp->vfs_data;
 
+#ifdef sun
 	/*
 	 * If this is a snapshot, we have an extra VFS_HOLD on our parent
 	 * from zfs_mount().  Release it here.
 	 */
 	if (zfsvfs->z_issnap)
 		VFS_RELE(zfsvfs->z_parent->z_vfs);
+#endif	/* sun */
 
 	zfsvfs_free(zfsvfs);