From owner-p4-projects@FreeBSD.ORG  Mon Jan 26 15:30:05 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E8F2C1065676; Mon, 26 Jan 2009 15:30:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A87FB106566C
	for <perforce@freebsd.org>; Mon, 26 Jan 2009 15:30:04 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 963D98FC21
	for <perforce@freebsd.org>; Mon, 26 Jan 2009 15:30:04 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0QFU4NM034485
	for <perforce@freebsd.org>; Mon, 26 Jan 2009 15:30:04 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0QFU4nl034483
	for perforce@freebsd.org; Mon, 26 Jan 2009 15:30:04 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 26 Jan 2009 15:30:04 GMT
Message-Id: <200901261530.n0QFU4nl034483@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 156688 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jan 2009 15:30:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=156688

Change 156688 by jhb@jhb_jhbbsd on 2009/01/26 15:29:33

	Revert this from here.

Affected files ...

.. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#41 edit

Differences ...

==== //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#41 (text+ko) ====

@@ -319,9 +319,11 @@
 	struct g_consumer *cp;
 	struct bufobj *bo;
 
+	DROP_GIANT();
 	g_topology_lock();
 	error = g_vfs_open(devvp, &cp, "udf", 0);
 	g_topology_unlock();
+	PICKUP_GIANT();
 	VOP_UNLOCK(devvp, 0);
 	if (error)
 		return error;
@@ -361,9 +363,11 @@
 
 	if (((logical_secsize % cp->provider->sectorsize) != 0) ||
 	    (logical_secsize < cp->provider->sectorsize)) {
+		DROP_GIANT();
 		g_topology_lock();
 		g_vfs_close(cp);
 		g_topology_unlock();
+		PICKUP_GIANT();
 		return (EINVAL);
 	}
 
@@ -487,9 +491,11 @@
 		free(udfmp, M_UDFMOUNT);
 	if (bp != NULL)
 		brelse(bp);
+	DROP_GIANT();
 	g_topology_lock();
 	g_vfs_close(cp);
 	g_topology_unlock();
+	PICKUP_GIANT();
 	return error;
 };
 
@@ -516,9 +522,11 @@
 #endif
 	}
 
+	DROP_GIANT();
 	g_topology_lock();
 	g_vfs_close(udfmp->im_cp);
 	g_topology_unlock();
+	PICKUP_GIANT();
 	vrele(udfmp->im_devvp);
 
 	if (udfmp->s_table != NULL)