PERFORCE change 157201 for review

[Edward Tomasz Napierala]

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

Change 157201 by trasz at 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)