From owner-svn-src-head@FreeBSD.ORG  Wed Jan  5 18:46:05 2011
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 75F751065696;
	Wed,  5 Jan 2011 18:46:05 +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 64FDD8FC18;
	Wed,  5 Jan 2011 18:46:05 +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 p05Ik5pb087570;
	Wed, 5 Jan 2011 18:46:05 GMT (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p05Ik5a1087568;
	Wed, 5 Jan 2011 18:46:05 GMT (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201101051846.p05Ik5a1087568@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Wed, 5 Jan 2011 18:46:05 +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: r217017 - head/sys/fs/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: Wed, 05 Jan 2011 18:46:05 -0000

Author: rmacklem
Date: Wed Jan  5 18:46:05 2011
New Revision: 217017
URL: http://svn.freebsd.org/changeset/base/217017

Log:
  Fix the experimental NFS server to use vfs_busyfs() instead
  of vfs_getvfs() so that the mount point is busied for the
  VFS_FHTOVP() call. This is analagous to r185432 for the
  regular NFS server.
  
  Reviewed by:	kib
  MFC after:	12 days

Modified:
  head/sys/fs/nfsserver/nfs_nfsdport.c

Modified: head/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdport.c	Wed Jan  5 18:27:38 2011	(r217016)
+++ head/sys/fs/nfsserver/nfs_nfsdport.c	Wed Jan  5 18:46:05 2011	(r217017)
@@ -2548,8 +2548,8 @@ nfsd_fhtovp(struct nfsrv_descript *nd, s
 	/*
 	 * Check for the special case of the nfsv4root_fh.
 	 */
-	mp = vfs_getvfs(&fhp->fh_fsid);
-	if (!mp) {
+	mp = vfs_busyfs(&fhp->fh_fsid);
+	if (mp == NULL) {
 		*vpp = NULL;
 		nd->nd_repstat = ESTALE;
 		if (*mpp && exp->nes_vfslocked)
@@ -2575,6 +2575,7 @@ nfsd_fhtovp(struct nfsrv_descript *nd, s
 
 	nd->nd_repstat = nfsvno_fhtovp(mp, fhp, nd->nd_nam, lktype, vpp, exp,
 	    &credanon);
+	vfs_unbusy(mp);
 
 	/*
 	 * For NFSv4 without a pseudo root fs, unexported file handles
@@ -2636,11 +2637,8 @@ nfsd_fhtovp(struct nfsrv_descript *nd, s
 			VFS_UNLOCK_GIANT(mp);
 			exp->nes_vfslocked = 0;
 		}
-		vfs_rel(mp);
 		*vpp = NULL;
 		*mpp = NULL;
-	} else {
-		vfs_rel(mp);
 	}
 }
 
@@ -2780,10 +2778,11 @@ nfsvno_getvp(fhandle_t *fhp)
 	struct vnode *vp;
 	int error;
 
-	mp = vfs_getvfs(&fhp->fh_fsid);
+	mp = vfs_busyfs(&fhp->fh_fsid);
 	if (mp == NULL)
 		return (NULL);
 	error = VFS_FHTOVP(mp, &fhp->fh_fid, &vp);
+	vfs_unbusy(mp);
 	if (error)
 		return (NULL);
 	return (vp);