From owner-p4-projects@FreeBSD.ORG  Wed Sep 21 11:58:24 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5582F16A421; Wed, 21 Sep 2005 11:58:24 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1700316A41F
	for <perforce@freebsd.org>; Wed, 21 Sep 2005 11:58:24 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D50DC43D45
	for <perforce@freebsd.org>; Wed, 21 Sep 2005 11:58:23 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j8LBwNrf044372
	for <perforce@freebsd.org>; Wed, 21 Sep 2005 11:58:23 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8LBwNUT044369
	for perforce@freebsd.org; Wed, 21 Sep 2005 11:58:23 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 21 Sep 2005 11:58:23 GMT
Message-Id: <200509211158.j8LBwNUT044369@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 84051 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: Wed, 21 Sep 2005 11:58:24 -0000

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

Change 84051 by rwatson@rwatson_zoo on 2005/09/21 11:57:45

	Be less agressive about removing Giant around vn_close(), we're not
	quite there yet.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#36 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#36 (text+ko) ====

@@ -561,6 +561,7 @@
 	TAILQ_HEAD(, kaudit_record) ar_worklist;
 	struct kaudit_record *ar;
 	struct vnode *audit_vp, *old_vp;
+	int vfslocked;
 
 	struct ucred *audit_cred, *old_cred;
 	struct thread *audit_td;
@@ -605,8 +606,10 @@
 			if (old_vp != NULL) {
 				AUDIT_PRINTF(("Closing old audit file\n"));
 				mtx_unlock(&audit_mtx);
+				vfslocked = VFS_LOCK_GIANT(old_vp->v_mount);
 				vn_close(old_vp, audit_close_flags, old_cred,
 				    audit_td);
+				VFS_UNLOCK_GIANT(vfslocked);
 				crfree(old_cred);
 				mtx_lock(&audit_mtx);
 				old_cred = NULL;