From owner-svn-src-head@FreeBSD.ORG  Tue Dec 21 23:04:04 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 77EB8106564A;
	Tue, 21 Dec 2010 23:04:04 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 671B38FC0C;
	Tue, 21 Dec 2010 23:04:04 +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 oBLN44kZ078113;
	Tue, 21 Dec 2010 23:04:04 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBLN44pN078111;
	Tue, 21 Dec 2010 23:04:04 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201012212304.oBLN44pN078111@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Tue, 21 Dec 2010 23:04:04 +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: r216631 - head/sys/nfsserver
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: Tue, 21 Dec 2010 23:04:04 -0000

Author: pjd
Date: Tue Dec 21 23:04:04 2010
New Revision: 216631
URL: http://svn.freebsd.org/changeset/base/216631

Log:
  On error, unbusy file system and jump to the end, so we won't try to unlock
  NULL *vpp.
  
  Reviewed by:	kib
  MFC after:	5 days

Modified:
  head/sys/nfsserver/nfs_srvsubs.c

Modified: head/sys/nfsserver/nfs_srvsubs.c
==============================================================================
--- head/sys/nfsserver/nfs_srvsubs.c	Tue Dec 21 22:48:56 2010	(r216630)
+++ head/sys/nfsserver/nfs_srvsubs.c	Tue Dec 21 23:04:04 2010	(r216631)
@@ -1144,6 +1144,8 @@ nfsrv_fhtovp(fhandle_t *fhp, int lockfla
 			vput(*vpp);
 			*vpp = NULL;
 			error = NFSERR_AUTHERR | AUTH_TOOWEAK;
+			vfs_unbusy(mp);
+			goto out;
 		}
 	}
 #endif