From owner-svn-src-stable@FreeBSD.ORG  Mon Apr 25 21:27:39 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1B691106566C;
	Mon, 25 Apr 2011 21:27:39 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 088808FC15;
	Mon, 25 Apr 2011 21:27:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p3PLRcgf093032;
	Mon, 25 Apr 2011 21:27:38 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p3PLRcwI093030;
	Mon, 25 Apr 2011 21:27:38 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201104252127.p3PLRcwI093030@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Mon, 25 Apr 2011 21:27:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221029 - stable/8/sys/fs/nfsserver
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Apr 2011 21:27:39 -0000

Author: rmacklem
Date: Mon Apr 25 21:27:38 2011
New Revision: 221029
URL: http://svn.freebsd.org/changeset/base/221029

Log:
  MFC: r220546
  Vrele ni_startdir in the experimental NFS server for the case
  of NFSv2 getting an error return from VOP_MKNOD(). Without this
  patch, the server file system remains busy after an NFSv2
  VOP_MKNOD() fails.

Modified:
  stable/8/sys/fs/nfsserver/nfs_nfsdport.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- stable/8/sys/fs/nfsserver/nfs_nfsdport.c	Mon Apr 25 21:14:13 2011	(r221028)
+++ stable/8/sys/fs/nfsserver/nfs_nfsdport.c	Mon Apr 25 21:27:38 2011	(r221029)
@@ -763,10 +763,9 @@ nfsvno_createsub(struct nfsrv_descript *
 			    &ndp->ni_cnd, &nvap->na_vattr);
 			vput(ndp->ni_dvp);
 			nfsvno_relpathbuf(ndp);
-			if (error) {
-				vrele(ndp->ni_startdir);
+			vrele(ndp->ni_startdir);
+			if (error)
 				return (error);
-			}
 		} else {
 			vrele(ndp->ni_startdir);
 			nfsvno_relpathbuf(ndp);