svn commit: r221029 - stable/8/sys/fs/nfsserver

[Rick Macklem]

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);