From owner-p4-projects@FreeBSD.ORG  Thu Feb  5 09:02:34 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DA7181065670; Thu,  5 Feb 2009 09:02:33 +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 9B239106566B
	for <perforce@freebsd.org>; Thu,  5 Feb 2009 09:02:33 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 894B48FC0A
	for <perforce@freebsd.org>; Thu,  5 Feb 2009 09:02:33 +0000 (UTC)
	(envelope-from trasz@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 n1592XXi008501
	for <perforce@freebsd.org>; Thu, 5 Feb 2009 09:02:33 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1592XMX008499
	for perforce@freebsd.org; Thu, 5 Feb 2009 09:02:33 GMT
	(envelope-from trasz@freebsd.org)
Date: Thu, 5 Feb 2009 09:02:33 GMT
Message-Id: <200902050902.n1592XMX008499@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 157201 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: Thu, 05 Feb 2009 09:02:34 -0000

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

Change 157201 by trasz@trasz_victim7 on 2009/02/05 09:01:44

	IFC.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_syscalls.c#16 integrate

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_syscalls.c#16 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.469 2009/01/23 22:13:30 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.470 2009/02/05 08:46:18 trasz Exp $");
 
 #include "opt_compat.h"
 #include "opt_kdtrace.h"
@@ -395,14 +395,16 @@
 		vfs_ref(mp);
 	VOP_UNLOCK(vp, 0);
 	fdrop(fp, td);
-	if (vp->v_iflag & VI_DOOMED) {
+	if (mp == NULL) {
 		error = EBADF;
 		goto out;
 	}
 	error = vfs_busy(mp, 0);
 	vfs_rel(mp);
-	if (error)
-		goto out;
+	if (error) {
+		VFS_UNLOCK_GIANT(vfslocked);
+		return (error);
+	}
 #ifdef MAC
 	error = mac_mount_check_stat(td->td_ucred, mp);
 	if (error)