Remove the old NFS client and server from head,

which means that the NFSCLIENT and NFSSERVER
kernel options will no longer work. This commit
only removes the kernel components. Removal of
unused code in the user utilities will be done
later. This commit does not include an addition
to UPDATING, but that will be committed in a
few minutes.

Discussed on: freebsd-fs

4 files changed, 0 insertions, 5995 deletions

diff --git a/sys/nfsserver/nfs_fha_old.c b/sys/nfsserver/nfs_fha_old.c
deleted file mode 100644
index a928278..0000000
--- a/sys/nfsserver/nfs_fha_old.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*-
- * Copyright (c) 2008 Isilon Inc http://www.isilon.com/
- * Copyright (c) 2013 Spectra Logic Corporation
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/sysproto.h>
-#include <sys/kernel.h>
-#include <sys/vnode.h>
-#include <sys/malloc.h>
-#include <sys/mount.h>
-#include <sys/mbuf.h>
-#include <sys/sysctl.h>
-
-#include <rpc/rpc.h>
-#include <nfs/xdr_subs.h>
-#include <nfs/nfsproto.h>
-#include <nfs/nfs_fha.h>
-#include <nfsserver/nfs.h>
-#include <nfsserver/nfsm_subs.h>
-#include <nfsserver/nfs_fha_old.h>
-
-static void fhaold_init(void *foo);
-static void fhaold_uninit(void *foo);
-rpcproc_t fhaold_get_procnum(rpcproc_t procnum);
-int fhaold_realign(struct mbuf **mb, int malloc_flags);
-int fhaold_get_fh(uint64_t *fh, int v3, struct mbuf **md, caddr_t *dpos);
-int fhaold_is_read(rpcproc_t procnum);
-int fhaold_is_write(rpcproc_t procnum);
-int fhaold_get_offset(struct mbuf **md, caddr_t *dpos, int v3,
-		      struct fha_info *info);
-int fhaold_no_offset(rpcproc_t procnum);
-void fhaold_set_locktype(rpcproc_t procnum, struct fha_info *info);
-static int fheold_stats_sysctl(SYSCTL_HANDLER_ARGS);
-
-static struct fha_params fhaold_softc;
-
-SYSCTL_DECL(_vfs_nfsrv);
-
-extern SVCPOOL *nfsrv_pool;
-
-SYSINIT(nfs_fhaold, SI_SUB_ROOT_CONF, SI_ORDER_ANY, fhaold_init, NULL);
-SYSUNINIT(nfs_fhaold, SI_SUB_ROOT_CONF, SI_ORDER_ANY, fhaold_uninit, NULL);
-
-static void
-fhaold_init(void *foo)
-{
-	struct fha_params *softc;
-
-	softc = &fhaold_softc;
-
-	bzero(softc, sizeof(*softc));
-
-	/*
-	 * Setup the callbacks for this FHA personality.
-	 */
-	softc->callbacks.get_procnum = fhaold_get_procnum;
-	softc->callbacks.realign = fhaold_realign;
-	softc->callbacks.get_fh = fhaold_get_fh;
-	softc->callbacks.is_read = fhaold_is_read;
-	softc->callbacks.is_write = fhaold_is_write;
-	softc->callbacks.get_offset = fhaold_get_offset;
-	softc->callbacks.no_offset = fhaold_no_offset;
-	softc->callbacks.set_locktype = fhaold_set_locktype;
-	softc->callbacks.fhe_stats_sysctl = fheold_stats_sysctl;
-
-	snprintf(softc->server_name, sizeof(softc->server_name),
-	    FHAOLD_SERVER_NAME);
-
-	softc->pool = &nfsrv_pool;
-
-	/*
-	 * Initialize the sysctl context list for the fha module.
-	 */
-	sysctl_ctx_init(&softc->sysctl_ctx);
-	softc->sysctl_tree = SYSCTL_ADD_NODE(&softc->sysctl_ctx,
-	    SYSCTL_STATIC_CHILDREN(_vfs_nfsrv), OID_AUTO, "fha", CTLFLAG_RD,
-	    0, "fha node");
-	if (softc->sysctl_tree == NULL) {
-		printf("%s: unable to allocate sysctl tree\n", __func__);
-		return;
-	}
-	fha_init(softc);
-}
-
-static void
-fhaold_uninit(void *foo)
-{
-	struct fha_params *softc;
-
-	softc = &fhaold_softc;
-
-	fha_uninit(softc);
-}
-
-
-rpcproc_t
-fhaold_get_procnum(rpcproc_t procnum)
-{
-	if (procnum > NFSV2PROC_STATFS)
-		return (-1);
-
-	return (nfsrv_nfsv3_procid[procnum]);
-}
-
-int
-fhaold_realign(struct mbuf **mb, int malloc_flags)
-{
-	return (nfs_realign(mb, malloc_flags));
-}
-
-int
-fhaold_get_fh(uint64_t *fh, int v3, struct mbuf **md, caddr_t *dpos)
-{
-	u_int32_t *tl;
-	uint8_t *buf;
-	uint64_t t;
-	int fhlen, i;
-
-	if (v3) {
-		tl = nfsm_dissect_xx_nonblock(NFSX_UNSIGNED, md, dpos);
-		if (tl == NULL)
-			return EBADRPC;
-		fhlen = fxdr_unsigned(int, *tl);
-		if (fhlen != 0 && fhlen != NFSX_V3FH)
-			return EBADRPC;
-	} else {
-		fhlen = NFSX_V2FH;
-	}
-	t = 0;
-	if (fhlen != 0) {
-		buf = nfsm_dissect_xx_nonblock(fhlen, md, dpos);
-		if (buf == NULL)
-			return EBADRPC;
-		for (i = 0; i < fhlen; i++)
-			t ^= ((uint64_t)buf[i] << (i & 7) * 8);
-	}
-	*fh = t;
-	return 0;
-}
-
-int
-fhaold_is_read(rpcproc_t procnum)
-{
-	if (procnum == NFSPROC_READ)
-		return (1);
-	else
-		return (0);
-}
-
-int
-fhaold_is_write(rpcproc_t procnum)
-{
-	if (procnum == NFSPROC_WRITE)
-		return (1);
-	else
-		return (0);
-}
-
-int
-fhaold_get_offset(struct mbuf **md, caddr_t *dpos, int v3,
-		  struct fha_info *info)
-{
-	uint32_t *tl;
-
-	if (v3) {
-		tl = nfsm_dissect_xx_nonblock(2 * NFSX_UNSIGNED, md, dpos);
-		if (tl == NULL)
-			goto out;
-		info->offset = fxdr_hyper(tl);
-	} else {
-		tl = nfsm_dissect_xx_nonblock(NFSX_UNSIGNED, md, dpos);
-		if (tl == NULL)
-			goto out;
-		info->offset = fxdr_unsigned(uint32_t, *tl);
-	}
-
-	return (0);
-out:
-	return (-1);
-}
-
-int
-fhaold_no_offset(rpcproc_t procnum)
-{
-	if (procnum == NFSPROC_FSSTAT ||
-	    procnum == NFSPROC_FSINFO ||
-	    procnum == NFSPROC_PATHCONF ||
-	    procnum == NFSPROC_NOOP ||
-	    procnum == NFSPROC_NULL)
-		return (1);
-	else
-		return (0);
-}
-
-void
-fhaold_set_locktype(rpcproc_t procnum, struct fha_info *info)
-{
-	switch (procnum) {
-	case NFSPROC_NULL:
-	case NFSPROC_GETATTR:
-	case NFSPROC_LOOKUP:
-	case NFSPROC_ACCESS:
-	case NFSPROC_READLINK:
-	case NFSPROC_READ:
-	case NFSPROC_READDIR:
-	case NFSPROC_READDIRPLUS:
-	case NFSPROC_WRITE:
-		info->locktype = LK_SHARED;
-		break;
-	case NFSPROC_SETATTR:
-	case NFSPROC_CREATE:
-	case NFSPROC_MKDIR:
-	case NFSPROC_SYMLINK:
-	case NFSPROC_MKNOD:
-	case NFSPROC_REMOVE:
-	case NFSPROC_RMDIR:
-	case NFSPROC_RENAME:
-	case NFSPROC_LINK:
-	case NFSPROC_FSSTAT:
-	case NFSPROC_FSINFO:
-	case NFSPROC_PATHCONF:
-	case NFSPROC_COMMIT:
-	case NFSPROC_NOOP:
-		info->locktype = LK_EXCLUSIVE;
-		break;
-	}
-}
-
-static int
-fheold_stats_sysctl(SYSCTL_HANDLER_ARGS)
-{
-	return (fhe_stats_sysctl(oidp, arg1, arg2, req, &fhaold_softc));
-}
-
-SVCTHREAD *
-fhaold_assign(SVCTHREAD *this_thread, struct svc_req *req)
-{
-	return (fha_assign(this_thread, req, &fhaold_softc));
-}
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c
deleted file mode 100644
index 32fd3f5..0000000
--- a/sys/nfsserver/nfs_serv.c
+++ /dev/null
@@ -1,3767 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)nfs_serv.c  8.8 (Berkeley) 7/31/95
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-/*
- * nfs version 2 and 3 server calls to vnode ops
- * - these routines generally have 3 phases
- *   1 - break down and validate rpc request in mbuf list
- *   2 - do the vnode ops for the request
- *       (surprisingly ?? many are very similar to syscalls in vfs_syscalls.c)
- *   3 - build the rpc reply in an mbuf list
- *   nb:
- *	- do not mix the phases, since the nfsm_?? macros can return failures
- *	  on a bad rpc or similar and do not do any vrele() or vput()'s
- *
- *      - the nfsm_reply() macro generates an nfs rpc reply with the nfs
- *	error number iff error != 0 whereas
- *	returning an error from the server function implies a fatal error
- *	such as a badly constructed rpc request that should be dropped without
- *	a reply.
- *	For nfsm_reply(), the case where error == EBADRPC is treated
- *	specially; after constructing a reply, it does an immediate
- *	`goto nfsmout' to avoid getting any V3 post-op status appended.
- *
- * Other notes:
- *	Warning: always pay careful attention to resource cleanup on return
- *	and note that nfsm_*() macros can terminate a procedure on certain
- *	errors.
- *
- *	lookup() and namei()
- *	may return garbage in various structural fields/return elements
- *	if an error is returned, and may garbage up nd.ni_dvp even if no
- *	error is returned and you did not request LOCKPARENT or WANTPARENT.
- *
- *	We use the ni_cnd.cn_flags 'HASBUF' flag to track whether the name
- *	buffer has been freed or not.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/namei.h>
-#include <sys/unistd.h>
-#include <sys/vnode.h>
-#include <sys/mount.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/priv.h>
-#include <sys/dirent.h>
-#include <sys/stat.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/bio.h>
-#include <sys/buf.h>
-#include <sys/rwlock.h>
-
-#include <vm/vm.h>
-#include <vm/vm_extern.h>
-#include <vm/vm_object.h>
-
-#include <nfs/nfsproto.h>
-#include <nfsserver/nfs.h>
-#include <nfs/xdr_subs.h>
-#include <nfsserver/nfsm_subs.h>
-
-FEATURE(nfsserver, "NFS server");
-
-#ifdef NFSRV_DEBUG
-#define nfsdbprintf(info)	printf info
-#else
-#define nfsdbprintf(info)
-#endif
-
-#define MAX_COMMIT_COUNT	(1024 * 1024)
-
-#define	MAX_REORDERED_RPC	16
-#define NUM_HEURISTIC		1031
-#define NHUSE_INIT		64
-#define NHUSE_INC		16
-#define NHUSE_MAX		2048
-
-static struct nfsheur {
-	struct vnode *nh_vp;	/* vp to match (unreferenced pointer) */
-	off_t nh_nextoff;	/* next offset for sequential detection */
-	int nh_use;		/* use count for selection */
-	int nh_seqcount;	/* heuristic */
-} nfsheur[NUM_HEURISTIC];
-
-/* Global vars */
-
-int nfsrvw_procrastinate = NFS_GATHERDELAY * 1000;
-int nfsrvw_procrastinate_v3 = 0;
-
-static struct timeval	nfsver = { 0 };
-
-SYSCTL_NODE(_vfs, OID_AUTO, nfsrv, CTLFLAG_RW, 0, "NFS server");
-
-static int nfs_async;
-static int nfs_commit_blks;
-static int nfs_commit_miss;
-SYSCTL_INT(_vfs_nfsrv, OID_AUTO, async, CTLFLAG_RW, &nfs_async, 0,
-    "Tell client that writes were synced even though they were not");
-SYSCTL_INT(_vfs_nfsrv, OID_AUTO, commit_blks, CTLFLAG_RW, &nfs_commit_blks, 0,
-    "Number of completed commits");
-SYSCTL_INT(_vfs_nfsrv, OID_AUTO, commit_miss, CTLFLAG_RW, &nfs_commit_miss, 0, "");
-
-struct nfsrvstats nfsrvstats;
-SYSCTL_STRUCT(_vfs_nfsrv, NFS_NFSRVSTATS, nfsrvstats, CTLFLAG_RW,
-	&nfsrvstats, nfsrvstats, "S,nfsrvstats");
-
-static int	nfsrv_access(struct vnode *, accmode_t, struct ucred *,
-		    int, int);
-
-/*
- * Clear nameidata fields that are tested in nsfmout cleanup code prior
- * to using first nfsm macro (that might jump to the cleanup code).
- */
-
-static __inline void
-ndclear(struct nameidata *nd)
-{
-
-	nd->ni_cnd.cn_flags = 0;
-	nd->ni_vp = NULL;
-	nd->ni_dvp = NULL;
-	nd->ni_startdir = NULL;
-	nd->ni_strictrelative = 0;
-}
-
-/*
- * Heuristic to detect sequential operation.
- */
-static struct nfsheur *
-nfsrv_sequential_heuristic(struct uio *uio, struct vnode *vp)
-{
-	struct nfsheur *nh;
-	int hi, try;
-
-	/* Locate best candidate. */
-	try = 32;
-	hi = ((int)(vm_offset_t)vp / sizeof(struct vnode)) % NUM_HEURISTIC;
-	nh = &nfsheur[hi];
-	while (try--) {
-		if (nfsheur[hi].nh_vp == vp) {
-			nh = &nfsheur[hi];
-			break;
-		}
-		if (nfsheur[hi].nh_use > 0)
-			--nfsheur[hi].nh_use;
-		hi = (hi + 1) % NUM_HEURISTIC;
-		if (nfsheur[hi].nh_use < nh->nh_use)
-			nh = &nfsheur[hi];
-	}
-
-	/* Initialize hint if this is a new file. */
-	if (nh->nh_vp != vp) {
-		nh->nh_vp = vp;
-		nh->nh_nextoff = uio->uio_offset;
-		nh->nh_use = NHUSE_INIT;
-		if (uio->uio_offset == 0)
-			nh->nh_seqcount = 4;
-		else
-			nh->nh_seqcount = 1;
-	}
-
-	/* Calculate heuristic. */
-	if ((uio->uio_offset == 0 && nh->nh_seqcount > 0) ||
-	    uio->uio_offset == nh->nh_nextoff) {
-		/* See comments in vfs_vnops.c:sequential_heuristic(). */
-		nh->nh_seqcount += howmany(uio->uio_resid, 16384);
-		if (nh->nh_seqcount > IO_SEQMAX)
-			nh->nh_seqcount = IO_SEQMAX;
-	} else if (qabs(uio->uio_offset - nh->nh_nextoff) <= MAX_REORDERED_RPC *
-	    imax(vp->v_mount->mnt_stat.f_iosize, uio->uio_resid)) {
-		/* Probably a reordered RPC, leave seqcount alone. */
-	} else if (nh->nh_seqcount > 1) {
-		nh->nh_seqcount /= 2;
-	} else {
-		nh->nh_seqcount = 0;
-	}
-	nh->nh_use += NHUSE_INC;
-	if (nh->nh_use > NHUSE_MAX)
-		nh->nh_use = NHUSE_MAX;
-	return (nh);
-}
-
-/*
- * nfs v3 access service
- */
-int
-nfsrv3_access(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct mbuf **mrq)
-{
-	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
-	struct sockaddr *nam = nfsd->nd_nam;
-	caddr_t dpos = nfsd->nd_dpos;
-	struct ucred *cred = nfsd->nd_cr;
-	struct vnode *vp = NULL;
-	nfsfh_t nfh;
-	fhandle_t *fhp;
-	u_int32_t *tl;
-	caddr_t bpos;
-	int error = 0, rdonly, getret;
-	struct mbuf *mb, *mreq;
-	struct vattr vattr, *vap = &vattr;
-	u_long testmode, nfsmode;
-	int v3 = (nfsd->nd_flag & ND_NFSV3);
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-	if (!v3)
-		panic("nfsrv3_access: v3 proc called on a v2 connection");
-	fhp = &nfh.fh_generic;
-	nfsm_srvmtofh(fhp);
-	tl = nfsm_dissect_nonblock(u_int32_t *, NFSX_UNSIGNED);
-	error = nfsrv_fhtovp(fhp, 0, &vp, nfsd, slp, nam, &rdonly);
-	if (error) {
-		nfsm_reply(NFSX_UNSIGNED);
-		nfsm_srvpostop_attr(1, NULL);
-		error = 0;
-		goto nfsmout;
-	}
-	nfsmode = fxdr_unsigned(u_int32_t, *tl);
-	if ((nfsmode & NFSV3ACCESS_READ) &&
-		nfsrv_access(vp, VREAD, cred, rdonly, 0))
-		nfsmode &= ~NFSV3ACCESS_READ;
-	if (vp->v_type == VDIR)
-		testmode = (NFSV3ACCESS_MODIFY | NFSV3ACCESS_EXTEND |
-			NFSV3ACCESS_DELETE);
-	else
-		testmode = (NFSV3ACCESS_MODIFY | NFSV3ACCESS_EXTEND);
-	if ((nfsmode & testmode) &&
-		nfsrv_access(vp, VWRITE, cred, rdonly, 0))
-		nfsmode &= ~testmode;
-	if (vp->v_type == VDIR)
-		testmode = NFSV3ACCESS_LOOKUP;
-	else
-		testmode = NFSV3ACCESS_EXECUTE;
-	if ((nfsmode & testmode) &&
-		nfsrv_access(vp, VEXEC, cred, rdonly, 0))
-		nfsmode &= ~testmode;
-	getret = VOP_GETATTR(vp, vap, cred);
-	vput(vp);
-	vp = NULL;
-	nfsm_reply(NFSX_POSTOPATTR(1) + NFSX_UNSIGNED);
-	nfsm_srvpostop_attr(getret, vap);
-	tl = nfsm_build(u_int32_t *, NFSX_UNSIGNED);
-	*tl = txdr_unsigned(nfsmode);
-nfsmout:
-	if (vp)
-		vput(vp);
-	return(error);
-}
-
-/*
- * nfs getattr service
- */
-int
-nfsrv_getattr(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct mbuf **mrq)
-{
-	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
-	struct sockaddr *nam = nfsd->nd_nam;
-	caddr_t dpos = nfsd->nd_dpos;
-	struct ucred *cred = nfsd->nd_cr;
-	struct nfs_fattr *fp;
-	struct vattr va;
-	struct vattr *vap = &va;
-	struct vnode *vp = NULL;
-	nfsfh_t nfh;
-	fhandle_t *fhp;
-	caddr_t bpos;
-	int error = 0, rdonly;
-	struct mbuf *mb, *mreq;
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-	fhp = &nfh.fh_generic;
-	nfsm_srvmtofh(fhp);
-	error = nfsrv_fhtovp(fhp, 0, &vp, nfsd, slp, nam, &rdonly);
-	if (error) {
-		nfsm_reply(0);
-		error = 0;
-		goto nfsmout;
-	}
-	error = VOP_GETATTR(vp, vap, cred);
-	vput(vp);
-	vp = NULL;
-	nfsm_reply(NFSX_FATTR(nfsd->nd_flag & ND_NFSV3));
-	if (error) {
-		error = 0;
-		goto nfsmout;
-	}
-	fp = nfsm_build(struct nfs_fattr *,
-	    NFSX_FATTR(nfsd->nd_flag & ND_NFSV3));
-	nfsm_srvfillattr(vap, fp);
-	/* fall through */
-
-nfsmout:
-	if (vp)
-		vput(vp);
-	return(error);
-}
-
-/*
- * nfs setattr service
- */
-int
-nfsrv_setattr(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct mbuf **mrq)
-{
-	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
-	struct sockaddr *nam = nfsd->nd_nam;
-	caddr_t dpos = nfsd->nd_dpos;
-	struct ucred *cred = nfsd->nd_cr;
-	struct vattr va, preat;
-	struct vattr *vap = &va;
-	struct nfsv2_sattr *sp;
-	struct nfs_fattr *fp;
-	struct vnode *vp = NULL;
-	nfsfh_t nfh;
-	fhandle_t *fhp;
-	u_int32_t *tl;
-	caddr_t bpos;
-	int error = 0, rdonly, preat_ret = 1, postat_ret = 1;
-	int v3 = (nfsd->nd_flag & ND_NFSV3), gcheck = 0;
-	struct mbuf *mb, *mreq;
-	struct timespec guard = { 0, 0 };
-	struct mount *mp = NULL;
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-	fhp = &nfh.fh_generic;
-	nfsm_srvmtofh(fhp);
-	if ((mp = vfs_getvfs(&fhp->fh_fsid)) == NULL) {
-		error = ESTALE;
-		goto out;
-	}
-	(void) vn_start_write(NULL, &mp, V_WAIT);
-	vfs_rel(mp);		/* The write holds a ref. */
-	VATTR_NULL(vap);
-	if (v3) {
-		nfsm_srvsattr(vap);
-		tl = nfsm_dissect_nonblock(u_int32_t *, NFSX_UNSIGNED);
-		gcheck = fxdr_unsigned(int, *tl);
-		if (gcheck) {
-			tl = nfsm_dissect_nonblock(u_int32_t *, 2 * NFSX_UNSIGNED);
-			fxdr_nfsv3time(tl, &guard);
-		}
-	} else {
-		sp = nfsm_dissect_nonblock(struct nfsv2_sattr *, NFSX_V2SATTR);
-		/*
-		 * Nah nah nah nah na nah
-		 * There is a bug in the Sun client that puts 0xffff in the mode
-		 * field of sattr when it should put in 0xffffffff. The u_short
-		 * doesn't sign extend.
-		 * --> check the low order 2 bytes for 0xffff
-		 */
-		if ((fxdr_unsigned(int, sp->sa_mode) & 0xffff) != 0xffff)
-			vap->va_mode = nfstov_mode(sp->sa_mode);
-		if (sp->sa_uid != nfsrv_nfs_xdrneg1)
-			vap->va_uid = fxdr_unsigned(uid_t, sp->sa_uid);
-		if (sp->sa_gid != nfsrv_nfs_xdrneg1)
-			vap->va_gid = fxdr_unsigned(gid_t, sp->sa_gid);
-		if (sp->sa_size != nfsrv_nfs_xdrneg1)
-			vap->va_size = fxdr_unsigned(u_quad_t, sp->sa_size);
-		if (sp->sa_atime.nfsv2_sec != nfsrv_nfs_xdrneg1) {
-#ifdef notyet
-			fxdr_nfsv2time(&sp->sa_atime, &vap->va_atime);
-#else
-			vap->va_atime.tv_sec =
-				fxdr_unsigned(int32_t, sp->sa_atime.nfsv2_sec);
-			vap->va_atime.tv_nsec = 0;
-#endif
-		}
-		if (sp->sa_mtime.nfsv2_sec != nfsrv_nfs_xdrneg1)
-			fxdr_nfsv2time(&sp->sa_mtime, &vap->va_mtime);
-
-	}
-
-	/*
-	 * Now that we have all the fields, lets do it.
-	 */
-	error = nfsrv_fhtovp(fhp, 0, &vp, nfsd, slp, nam, &rdonly);
-	if (error) {
-		nfsm_reply(2 * NFSX_UNSIGNED);
-		if (v3)
-			nfsm_srvwcc_data(preat_ret, &preat, postat_ret, vap);
-		error = 0;
-		goto nfsmout;
-	}
-
-	/*
-	 * vp now an active resource, pay careful attention to cleanup
-	 */
-	if (v3) {
-		error = preat_ret = VOP_GETATTR(vp, &preat, cred);
-		if (!error && gcheck &&
-			(preat.va_ctime.tv_sec != guard.tv_sec ||
-			 preat.va_ctime.tv_nsec != guard.tv_nsec))
-			error = NFSERR_NOT_SYNC;
-		if (error) {
-			vput(vp);
-			vp = NULL;
-			nfsm_reply(NFSX_WCCDATA(v3));
-			if (v3)
-				nfsm_srvwcc_data(preat_ret, &preat, postat_ret, vap);
-			error = 0;
-			goto nfsmout;
-		}
-	}
-
-	/*
-	 * If the size is being changed write acces is required, otherwise
-	 * just check for a read only filesystem.
-	 */
-	if (vap->va_size == ((u_quad_t)((quad_t) -1))) {
-		if (rdonly || (vp->v_mount->mnt_flag & MNT_RDONLY)) {
-			error = EROFS;
-			goto out;
-		}
-	} else {
-		if (vp->v_type == VDIR) {
-			error = EISDIR;
-			goto out;
-		} else if ((error = nfsrv_access(vp, VWRITE, cred, rdonly,
-		    0)) != 0)
-			goto out;
-	}
-	error = VOP_SETATTR(vp, vap, cred);
-	postat_ret = VOP_GETATTR(vp, vap, cred);
-	if (!error)
-		error = postat_ret;
-out:
-	if (vp != NULL)
-		vput(vp);
-
-	vp = NULL;
-	nfsm_reply(NFSX_WCCORFATTR(v3));
-	if (v3) {
-		nfsm_srvwcc_data(preat_ret, &preat, postat_ret, vap);
-	} else if (!error) {
-		/* v2 non-error case. */
-		fp = nfsm_build(struct nfs_fattr *, NFSX_V2FATTR);
-		nfsm_srvfillattr(vap, fp);
-	}
-	error = 0;
-	/* fall through */
-
-nfsmout:
-	if (vp)
-		vput(vp);
-	vn_finished_write(mp);
-	return(error);
-}
-
-/*
- * nfs lookup rpc
- */
-int
-nfsrv_lookup(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct mbuf **mrq)
-{
-	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
-	struct sockaddr *nam = nfsd->nd_nam;
-	caddr_t dpos = nfsd->nd_dpos;
-	struct ucred *cred = nfsd->nd_cr;
-	struct nfs_fattr *fp;
-	struct nameidata nd, ind, *ndp = &nd;
-	struct vnode *vp, *dirp = NULL;
-	nfsfh_t nfh;
-	fhandle_t *fhp;
-	caddr_t bpos;
-	int error = 0, len, dirattr_ret = 1;
-	int v3 = (nfsd->nd_flag & ND_NFSV3), pubflag;
-	struct mbuf *mb, *mreq;
-	struct vattr va, dirattr, *vap = &va;
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-	ndclear(&nd);
-
-	fhp = &nfh.fh_generic;
-	nfsm_srvmtofh(fhp);
-	nfsm_srvnamesiz(len);
-
-	pubflag = nfs_ispublicfh(fhp);
-
-	nd.ni_cnd.cn_cred = cred;
-	nd.ni_cnd.cn_nameiop = LOOKUP;
-	nd.ni_cnd.cn_flags = LOCKLEAF | SAVESTART;
-	error = nfs_namei(&nd, nfsd, fhp, len, slp, nam, &md, &dpos,
-		&dirp, v3, &dirattr, &dirattr_ret, pubflag);
-
-	/*
-	 * namei failure, only dirp to cleanup.  Clear out garbarge from
-	 * structure in case macros jump to nfsmout.
-	 */
-
-	if (error) {
-		if (dirp) {
-			vrele(dirp);
-			dirp = NULL;
-		}
-		nfsm_reply(NFSX_POSTOPATTR(v3));
-		if (v3)
-			nfsm_srvpostop_attr(dirattr_ret, &dirattr);
-		error = 0;
-		goto nfsmout;
-	}
-
-	/*
-	 * Locate index file for public filehandle
-	 *
-	 * error is 0 on entry and 0 on exit from this block.
-	 */
-
-	if (pubflag) {
-		if (nd.ni_vp->v_type == VDIR && nfs_pub.np_index != NULL) {
-			/*
-			 * Setup call to lookup() to see if we can find
-			 * the index file. Arguably, this doesn't belong
-			 * in a kernel.. Ugh.  If an error occurs, do not
-			 * try to install an index file and then clear the
-			 * error.
-			 *
-			 * When we replace nd with ind and redirect ndp,
-			 * maintenance of ni_startdir and ni_vp shift to
-			 * ind and we have to clean them up in the old nd.
-			 * However, the cnd resource continues to be maintained
-			 * via the original nd.  Confused?  You aren't alone!
-			 */
-			ind = nd;
-			VOP_UNLOCK(nd.ni_vp, 0);
-			ind.ni_pathlen = strlen(nfs_pub.np_index);
-			ind.ni_cnd.cn_nameptr = ind.ni_cnd.cn_pnbuf =
-			    nfs_pub.np_index;
-			ind.ni_startdir = nd.ni_vp;
-			VREF(ind.ni_startdir);
-			error = lookup(&ind);
-			ind.ni_dvp = NULL;
-
-			if (error == 0) {
-				/*
-				 * Found an index file. Get rid of
-				 * the old references.  transfer nd.ni_vp'
-				 */
-				if (dirp)
-					vrele(dirp);
-				dirp = nd.ni_vp;
-				nd.ni_vp = NULL;
-				vrele(nd.ni_startdir);
-				nd.ni_startdir = NULL;
-				ndp = &ind;
-			}
-			error = 0;
-		}
-		/*
-		 * If the public filehandle was used, check that this lookup
-		 * didn't result in a filehandle outside the publicly exported
-		 * filesystem.  We clear the poor vp here to avoid lockups due
-		 * to NFS I/O.
-		 */
-
-		if (ndp->ni_vp->v_mount != nfs_pub.np_mount) {
-			vput(nd.ni_vp);
-			nd.ni_vp = NULL;
-			error = EPERM;
-		}
-	}
-
-	/*
-	 * Resources at this point:
-	 *	ndp->ni_vp	may not be NULL
-	 */
-
-	if (error) {
-		nfsm_reply(NFSX_POSTOPATTR(v3));
-		if (v3)
-			nfsm_srvpostop_attr(dirattr_ret, &dirattr);
-		error = 0;
-		goto nfsmout;
-	}
-
-	/*
-	 * Get underlying attribute, then release remaining resources ( for
-	 * the same potential blocking reason ) and reply.
-	 */
-	vp = ndp->ni_vp;
-	bzero((caddr_t)fhp, sizeof(nfh));
-	fhp->fh_fsid = vp->v_mount->mnt_stat.f_fsid;
-	error = VOP_VPTOFH(vp, &fhp->fh_fid);
-	if (!error)
-		error = VOP_GETATTR(vp, vap, cred);
-
-	vput(vp);
-	vrele(ndp->ni_startdir);
-	vrele(dirp);
-	ndp->ni_vp = NULL;
-	ndp->ni_startdir = NULL;
-	dirp = NULL;
-	nfsm_reply(NFSX_SRVFH(v3) + NFSX_POSTOPORFATTR(v3) + NFSX_POSTOPATTR(v3));
-	if (error) {
-		if (v3)
-			nfsm_srvpostop_attr(dirattr_ret, &dirattr);
-		error = 0;
-		goto nfsmout;
-	}
-	nfsm_srvfhtom(fhp, v3);
-	if (v3) {
-		nfsm_srvpostop_attr(0, vap);
-		nfsm_srvpostop_attr(dirattr_ret, &dirattr);
-	} else {
-		fp = nfsm_build(struct nfs_fattr *, NFSX_V2FATTR);
-		nfsm_srvfillattr(vap, fp);
-	}
-
-nfsmout:
-	if (ndp->ni_vp || dirp || ndp->ni_startdir) {
-		if (ndp->ni_vp)
-			vput(ndp->ni_vp);
-		if (dirp)
-			vrele(dirp);
-		if (ndp->ni_startdir)
-			vrele(ndp->ni_startdir);
-	}
-	NDFREE(&nd, NDF_ONLY_PNBUF);
-	return (error);
-}
-
-/*
- * nfs readlink service
- */
-int
-nfsrv_readlink(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct mbuf **mrq)
-{
-	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
-	struct sockaddr *nam = nfsd->nd_nam;
-	caddr_t dpos = nfsd->nd_dpos;
-	struct ucred *cred = nfsd->nd_cr;
-	struct iovec iv[(NFS_MAXPATHLEN+MLEN-1)/MLEN];
-	struct iovec *ivp = iv;
-	struct mbuf *mp;
-	u_int32_t *tl;
-	caddr_t bpos;
-	int error = 0, rdonly, i, tlen, len, getret;
-	int v3 = (nfsd->nd_flag & ND_NFSV3);
-	struct mbuf *mb, *mp3, *nmp, *mreq;
-	struct vnode *vp = NULL;
-	struct vattr attr;
-	nfsfh_t nfh;
-	fhandle_t *fhp;
-	struct uio io, *uiop = &io;
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-#ifndef nolint
-	mp = NULL;
-#endif
-	mp3 = NULL;
-	fhp = &nfh.fh_generic;
-	nfsm_srvmtofh(fhp);
-	len = 0;
-	i = 0;
-	while (len < NFS_MAXPATHLEN) {
-		MGET(nmp, M_WAITOK, MT_DATA);
-		MCLGET(nmp, M_WAITOK);
-		nmp->m_len = NFSMSIZ(nmp);
-		if (len == 0)
-			mp3 = mp = nmp;
-		else {
-			mp->m_next = nmp;
-			mp = nmp;
-		}
-		if ((len + mp->m_len) > NFS_MAXPATHLEN) {
-			mp->m_len = NFS_MAXPATHLEN - len;
-			len = NFS_MAXPATHLEN;
-		} else
-			len += mp->m_len;
-		ivp->iov_base = mtod(mp, caddr_t);
-		ivp->iov_len = mp->m_len;
-		i++;
-		ivp++;
-	}
-	uiop->uio_iov = iv;
-	uiop->uio_iovcnt = i;
-	uiop->uio_offset = 0;
-	uiop->uio_resid = len;
-	uiop->uio_rw = UIO_READ;
-	uiop->uio_segflg = UIO_SYSSPACE;
-	uiop->uio_td = NULL;
-	error = nfsrv_fhtovp(fhp, 0, &vp, nfsd, slp, nam, &rdonly);
-	if (error) {
-		nfsm_reply(2 * NFSX_UNSIGNED);
-		if (v3)
-			nfsm_srvpostop_attr(1, NULL);
-		error = 0;
-		goto nfsmout;
-	}
-	if (vp->v_type != VLNK) {
-		if (v3)
-			error = EINVAL;
-		else
-			error = ENXIO;
-	} else 
-		error = VOP_READLINK(vp, uiop, cred);
-	getret = VOP_GETATTR(vp, &attr, cred);
-	vput(vp);
-	vp = NULL;
-	nfsm_reply(NFSX_POSTOPATTR(v3) + NFSX_UNSIGNED);
-	if (v3)
-		nfsm_srvpostop_attr(getret, &attr);
-	if (error) {
-		error = 0;
-		goto nfsmout;
-	}
-	if (uiop->uio_resid > 0) {
-		len -= uiop->uio_resid;
-		tlen = nfsm_rndup(len);
-		nfsm_adj(mp3, NFS_MAXPATHLEN-tlen, tlen-len);
-	}
-	tl = nfsm_build(u_int32_t *, NFSX_UNSIGNED);
-	*tl = txdr_unsigned(len);
-	mb->m_next = mp3;
-	mp3 = NULL;
-nfsmout:
-	if (mp3)
-		m_freem(mp3);
-	if (vp)
-		vput(vp);
-	return(error);
-}
-
-/*
- * nfs read service
- */
-int
-nfsrv_read(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct mbuf **mrq)
-{
-	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
-	struct sockaddr *nam = nfsd->nd_nam;
-	caddr_t dpos = nfsd->nd_dpos;
-	struct ucred *cred = nfsd->nd_cr;
-	struct iovec *iv;
-	struct iovec *iv2;
-	struct mbuf *m;
-	struct nfs_fattr *fp;
-	u_int32_t *tl;
-	int i;
-	caddr_t bpos;
-	int error = 0, rdonly, cnt, len, left, siz, tlen, getret;
-	int v3 = (nfsd->nd_flag & ND_NFSV3), reqlen;
-	struct mbuf *mb, *mreq;
-	struct mbuf *m2;
-	struct vnode *vp = NULL;
-	nfsfh_t nfh;
-	fhandle_t *fhp;
-	struct uio io, *uiop = &io;
-	struct vattr va, *vap = &va;
-	struct nfsheur *nh;
-	off_t off;
-	int ioflag = 0;
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-	fhp = &nfh.fh_generic;
-	nfsm_srvmtofh(fhp);
-	if (v3) {
-		tl = nfsm_dissect_nonblock(u_int32_t *, 2 * NFSX_UNSIGNED);
-		off = fxdr_hyper(tl);
-	} else {
-		tl = nfsm_dissect_nonblock(u_int32_t *, NFSX_UNSIGNED);
-		off = (off_t)fxdr_unsigned(u_int32_t, *tl);
-	}
-	nfsm_srvstrsiz(reqlen, NFS_SRVMAXDATA(nfsd));
-
-	/*
-	 * Reference vp.  If an error occurs, vp will be invalid, but we
-	 * have to NULL it just in case.  The macros might goto nfsmout
-	 * as well.
-	 */
-
-	error = nfsrv_fhtovp(fhp, 0, &vp, nfsd, slp, nam, &rdonly);
-	if (error) {
-		vp = NULL;
-		nfsm_reply(2 * NFSX_UNSIGNED);
-		if (v3)
-			nfsm_srvpostop_attr(1, NULL);
-		error = 0;
-		goto nfsmout;
-	}
-
-	if (vp->v_type != VREG) {
-		if (v3)
-			error = EINVAL;
-		else
-			error = (vp->v_type == VDIR) ? EISDIR : EACCES;
-	}
-	if (!error) {
-		if ((error = nfsrv_access(vp, VREAD, cred, rdonly, 1)) != 0)
-			error = nfsrv_access(vp, VEXEC, cred, rdonly, 1);
-	}
-	getret = VOP_GETATTR(vp, vap, cred);
-	if (!error)
-		error = getret;
-	if (error) {
-		vput(vp);
-		vp = NULL;
-		nfsm_reply(NFSX_POSTOPATTR(v3));
-		if (v3)
-			nfsm_srvpostop_attr(getret, vap);
-		error = 0;
-		goto nfsmout;
-	}
-
-	/*
-	 * Calculate byte count to read
-	 */
-	if (off >= vap->va_size)
-		cnt = 0;
-	else if ((off + reqlen) > vap->va_size)
-		cnt = vap->va_size - off;
-	else
-		cnt = reqlen;
-
-	nfsm_reply(NFSX_POSTOPORFATTR(v3) + 3 * NFSX_UNSIGNED+nfsm_rndup(cnt));
-	if (v3) {
-		tl = nfsm_build(u_int32_t *, NFSX_V3FATTR + 4 * NFSX_UNSIGNED);
-		*tl++ = nfsrv_nfs_true;
-		fp = (struct nfs_fattr *)tl;
-		tl += (NFSX_V3FATTR / sizeof (u_int32_t));
-	} else {
-		tl = nfsm_build(u_int32_t *, NFSX_V2FATTR + NFSX_UNSIGNED);
-		fp = (struct nfs_fattr *)tl;
-		tl += (NFSX_V2FATTR / sizeof (u_int32_t));
-	}
-	len = left = nfsm_rndup(cnt);
-	if (cnt > 0) {
-		/*
-		 * Generate the mbuf list with the uio_iov ref. to it.
-		 */
-		i = 0;
-		m = m2 = mb;
-		while (left > 0) {
-			siz = min(M_TRAILINGSPACE(m), left);
-			if (siz > 0) {
-				left -= siz;
-				i++;
-			}
-			if (left > 0) {
-				MGET(m, M_WAITOK, MT_DATA);
-				MCLGET(m, M_WAITOK);
-				m->m_len = 0;
-				m2->m_next = m;
-				m2 = m;
-			}
-		}
-		iv = malloc(i * sizeof (struct iovec),
-		       M_TEMP, M_WAITOK);
-		uiop->uio_iov = iv2 = iv;
-		m = mb;
-		left = len;
-		i = 0;
-		while (left > 0) {
-			if (m == NULL)
-				panic("nfsrv_read iov");
-			siz = min(M_TRAILINGSPACE(m), left);
-			if (siz > 0) {
-				iv->iov_base = mtod(m, caddr_t) + m->m_len;
-				iv->iov_len = siz;
-				m->m_len += siz;
-				left -= siz;
-				iv++;
-				i++;
-			}
-			m = m->m_next;
-		}
-		uiop->uio_iovcnt = i;
-		uiop->uio_offset = off;
-		uiop->uio_resid = len;
-		uiop->uio_rw = UIO_READ;
-		uiop->uio_segflg = UIO_SYSSPACE;
-		uiop->uio_td = NULL;
-		nh = nfsrv_sequential_heuristic(uiop, vp);
-		ioflag |= nh->nh_seqcount << IO_SEQSHIFT;
-		error = VOP_READ(vp, uiop, IO_NODELOCKED | ioflag, cred);
-		if (error == 0)
-			nh->nh_nextoff = uiop->uio_offset;
-		free((caddr_t)iv2, M_TEMP);
-		if (error || (getret = VOP_GETATTR(vp, vap, cred))) {
-			if (!error)
-				error = getret;
-			m_freem(mreq);
-			vput(vp);
-			vp = NULL;
-			nfsm_reply(NFSX_POSTOPATTR(v3));
-			if (v3)
-				nfsm_srvpostop_attr(getret, vap);
-			error = 0;
-			goto nfsmout;
-		}
-	} else
-		uiop->uio_resid = 0;
-	vput(vp);
-	vp = NULL;
-	nfsm_srvfillattr(vap, fp);
-	tlen = len - uiop->uio_resid;
-	cnt = cnt < tlen ? cnt : tlen;
-	tlen = nfsm_rndup(cnt);
-	if (len != tlen || tlen != cnt)
-		nfsm_adj(mb, len - tlen, tlen - cnt);
-	if (v3) {
-		*tl++ = txdr_unsigned(cnt);
-		if (cnt < reqlen)
-			*tl++ = nfsrv_nfs_true;
-		else
-			*tl++ = nfsrv_nfs_false;
-	}
-	*tl = txdr_unsigned(cnt);
-nfsmout:
-	if (vp)
-		vput(vp);
-	return(error);
-}
-
-/*
- * nfs write service
- */
-int
-nfsrv_write(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct mbuf **mrq)
-{
-	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
-	struct sockaddr *nam = nfsd->nd_nam;
-	caddr_t dpos = nfsd->nd_dpos;
-	struct ucred *cred = nfsd->nd_cr;
-	struct iovec *ivp;
-	int i, cnt;
-	struct mbuf *mp;
-	struct nfs_fattr *fp;
-	struct iovec *iv;
-	struct vattr va, forat;
-	struct vattr *vap = &va;
-	u_int32_t *tl;
-	caddr_t bpos;
-	int error = 0, rdonly, len, forat_ret = 1;
-	int ioflags, aftat_ret = 1, retlen = 0, zeroing, adjust;
-	int stable = NFSV3WRITE_FILESYNC;
-	int v3 = (nfsd->nd_flag & ND_NFSV3);
-	struct mbuf *mb, *mreq;
-	struct vnode *vp = NULL;
-	struct nfsheur *nh;
-	nfsfh_t nfh;
-	fhandle_t *fhp;
-	struct uio io, *uiop = &io;
-	off_t off;
-	struct mount *mntp = NULL;
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-	if (mrep == NULL) {
-		*mrq = NULL;
-		error = 0;
-		goto nfsmout;
-	}
-	fhp = &nfh.fh_generic;
-	nfsm_srvmtofh(fhp);
-	if ((mntp = vfs_getvfs(&fhp->fh_fsid)) == NULL) {
-		error = ESTALE;
-		goto ereply;
-	}
-	(void) vn_start_write(NULL, &mntp, V_WAIT);
-	vfs_rel(mntp);		/* The write holds a ref. */
-	if (v3) {
-		tl = nfsm_dissect_nonblock(u_int32_t *, 5 * NFSX_UNSIGNED);
-		off = fxdr_hyper(tl);
-		tl += 3;
-		stable = fxdr_unsigned(int, *tl++);
-	} else {
-		tl = nfsm_dissect_nonblock(u_int32_t *, 4 * NFSX_UNSIGNED);
-		off = (off_t)fxdr_unsigned(u_int32_t, *++tl);
-		tl += 2;
-		if (nfs_async)
-	    		stable = NFSV3WRITE_UNSTABLE;
-	}
-	retlen = len = fxdr_unsigned(int32_t, *tl);
-	cnt = i = 0;
-
-	/*
-	 * For NFS Version 2, it is not obvious what a write of zero length
-	 * should do, but I might as well be consistent with Version 3,
-	 * which is to return ok so long as there are no permission problems.
-	 */
-	if (len > 0) {
-	    zeroing = 1;
-	    mp = mrep;
-	    while (mp) {
-		if (mp == md) {
-			zeroing = 0;
-			adjust = dpos - mtod(mp, caddr_t);
-			mp->m_len -= adjust;
-			if (mp->m_len > 0 && adjust > 0)
-				mp->m_data += adjust;
-		}
-		if (zeroing)
-			mp->m_len = 0;
-		else if (mp->m_len > 0) {
-			i += mp->m_len;
-			if (i > len) {
-				mp->m_len -= (i - len);
-				zeroing	= 1;
-			}
-			if (mp->m_len > 0)
-				cnt++;
-		}
-		mp = mp->m_next;
-	    }
-	}
-	if (len > NFS_MAXDATA || len < 0 || i < len) {
-		error = EIO;
-		nfsm_reply(2 * NFSX_UNSIGNED);
-		if (v3)
-			nfsm_srvwcc_data(forat_ret, &forat, aftat_ret, vap);
-		error = 0;
-		goto nfsmout;
-	}
-	error = nfsrv_fhtovp(fhp, 0, &vp, nfsd, slp, nam, &rdonly);
-	if (error) {
-		vp = NULL;
-		nfsm_reply(2 * NFSX_UNSIGNED);
-		if (v3)
-			nfsm_srvwcc_data(forat_ret, &forat, aftat_ret, vap);
-		error = 0;
-		goto nfsmout;
-	}
-	if (v3)
-		forat_ret = VOP_GETATTR(vp, &forat, cred);
-	if (vp->v_type != VREG) {
-		if (v3)
-			error = EINVAL;
-		else
-			error = (vp->v_type == VDIR) ? EISDIR : EACCES;
-	}
-	if (!error)
-		error = nfsrv_access(vp, VWRITE, cred, rdonly, 1);
-	if (error) {
-		vput(vp);
-		vp = NULL;
-		nfsm_reply(NFSX_WCCDATA(v3));
-		if (v3)
-			nfsm_srvwcc_data(forat_ret, &forat, aftat_ret, vap);
-		error = 0;
-		goto nfsmout;
-	}
-
-	if (len > 0) {
-	    ivp = malloc(cnt * sizeof (struct iovec), M_TEMP,
-		M_WAITOK);
-	    uiop->uio_iov = iv = ivp;
-	    uiop->uio_iovcnt = cnt;
-	    mp = mrep;
-	    while (mp) {
-		if (mp->m_len > 0) {
-			ivp->iov_base = mtod(mp, caddr_t);
-			ivp->iov_len = mp->m_len;
-			ivp++;
-		}
-		mp = mp->m_next;
-	    }
-
-	    /*
-	     * XXX
-	     * The IO_METASYNC flag indicates that all metadata (and not just
-	     * enough to ensure data integrity) mus be written to stable storage
-	     * synchronously.
-	     * (IO_METASYNC is not yet implemented in 4.4BSD-Lite.)
-	     */
-	    if (stable == NFSV3WRITE_UNSTABLE)
-		ioflags = IO_NODELOCKED;
-	    else if (stable == NFSV3WRITE_DATASYNC)
-		ioflags = (IO_SYNC | IO_NODELOCKED);
-	    else
-		ioflags = (IO_METASYNC | IO_SYNC | IO_NODELOCKED);
-	    uiop->uio_resid = len;
-	    uiop->uio_rw = UIO_WRITE;
-	    uiop->uio_segflg = UIO_SYSSPACE;
-	    uiop->uio_td = NULL;
-	    uiop->uio_offset = off;
-	    nh = nfsrv_sequential_heuristic(uiop, vp);
-	    ioflags |= nh->nh_seqcount << IO_SEQSHIFT;
-	    error = VOP_WRITE(vp, uiop, ioflags, cred);
-	    if (error == 0)
-		    nh->nh_nextoff = uiop->uio_offset;
-	    /* Unlocked write. */
-	    nfsrvstats.srvvop_writes++;
-	    free((caddr_t)iv, M_TEMP);
-	}
-	aftat_ret = VOP_GETATTR(vp, vap, cred);
-	vput(vp);
-	vp = NULL;
-	if (!error)
-		error = aftat_ret;
-ereply:
-	nfsm_reply(NFSX_PREOPATTR(v3) + NFSX_POSTOPORFATTR(v3) +
-		2 * NFSX_UNSIGNED + NFSX_WRITEVERF(v3));
-	if (v3) {
-		nfsm_srvwcc_data(forat_ret, &forat, aftat_ret, vap);
-		if (error) {
-			error = 0;
-			goto nfsmout;
-		}
-		tl = nfsm_build(u_int32_t *, 4 * NFSX_UNSIGNED);
-		*tl++ = txdr_unsigned(retlen);
-		/*
-		 * If nfs_async is set, then pretend the write was FILESYNC.
-		 */
-		if (stable == NFSV3WRITE_UNSTABLE && !nfs_async)
-			*tl++ = txdr_unsigned(stable);
-		else
-			*tl++ = txdr_unsigned(NFSV3WRITE_FILESYNC);
-		/*
-		 * Actually, there is no need to txdr these fields,
-		 * but it may make the values more human readable,
-		 * for debugging purposes.
-		 */
-		if (nfsver.tv_sec == 0)
-			nfsver = boottime;
-		*tl++ = txdr_unsigned(nfsver.tv_sec);
-		*tl = txdr_unsigned(nfsver.tv_usec);
-	} else if (!error) {
-		/* v2 non-error case. */
-		fp = nfsm_build(struct nfs_fattr *, NFSX_V2FATTR);
-		nfsm_srvfillattr(vap, fp);
-	}
-	error = 0;
-nfsmout:
-	if (vp)
-		vput(vp);
-	vn_finished_write(mntp);
-	return(error);
-}
-
-/*
- * nfs create service
- * now does a truncate to 0 length via. setattr if it already exists
- */
-int
-nfsrv_create(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct mbuf **mrq)
-{
-	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
-	struct sockaddr *nam = nfsd->nd_nam;
-	caddr_t dpos = nfsd->nd_dpos;
-	struct ucred *cred = nfsd->nd_cr;
-	struct nfs_fattr *fp;
-	struct vattr va, dirfor, diraft;
-	struct vattr *vap = &va;
-	struct nfsv2_sattr *sp;
-	u_int32_t *tl;
-	struct nameidata nd;
-	caddr_t bpos;
-	int error = 0, rdev, len, tsize, dirfor_ret = 1, diraft_ret = 1;
-	int v3 = (nfsd->nd_flag & ND_NFSV3), how, exclusive_flag = 0;
-	struct mbuf *mb, *mreq;
-	struct vnode *dirp = NULL;
-	nfsfh_t nfh;
-	fhandle_t *fhp;
-	u_quad_t tempsize;
-	struct timespec cverf;
-	struct mount *mp = NULL;
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-#ifndef nolint
-	rdev = 0;
-#endif
-	ndclear(&nd);
-
-	fhp = &nfh.fh_generic;
-	nfsm_srvmtofh(fhp);
-	if ((mp = vfs_getvfs(&fhp->fh_fsid)) == NULL) {
-		error = ESTALE;
-		goto ereply;
-	}
-	(void) vn_start_write(NULL, &mp, V_WAIT);
-	vfs_rel(mp);		/* The write holds a ref. */
-	nfsm_srvnamesiz(len);
-
-	nd.ni_cnd.cn_cred = cred;
-	nd.ni_cnd.cn_nameiop = CREATE;
-	nd.ni_cnd.cn_flags = LOCKPARENT | LOCKLEAF | SAVESTART | NOCACHE;
-
-	/*
-	 * Call namei and do initial cleanup to get a few things
-	 * out of the way.  If we get an initial error we cleanup
-	 * and return here to avoid special-casing the invalid nd
-	 * structure through the rest of the case.  dirp may be
-	 * set even if an error occurs, but the nd structure will not
-	 * be valid at all if an error occurs so we have to invalidate it
-	 * prior to calling nfsm_reply ( which might goto nfsmout ).
-	 */
-	error = nfs_namei(&nd, nfsd, fhp, len, slp, nam, &md, &dpos,
-		&dirp, v3, &dirfor, &dirfor_ret, FALSE);
-	if (dirp && !v3) {
-		vrele(dirp);
-		dirp = NULL;
-	}
-	if (error) {
-		nfsm_reply(NFSX_WCCDATA(v3));
-		if (v3)
-			nfsm_srvwcc_data(dirfor_ret, &dirfor, diraft_ret, &diraft);
-		error = 0;
-		goto nfsmout;
-	}
-
-	/*
-	 * No error.  Continue.  State:
-	 *
-	 *	startdir	is valid ( we release this immediately )
-	 *	dirp 		may be valid
-	 *	nd.ni_vp	may be valid
-	 *	nd.ni_dvp	is valid
-	 *
-	 * The error state is set through the code and we may also do some
-	 * opportunistic releasing of vnodes to avoid holding locks through
-	 * NFS I/O.  The cleanup at the end is a catch-all
-	 */
-
-	VATTR_NULL(vap);
-	if (v3) {
-		tl = nfsm_dissect_nonblock(u_int32_t *, NFSX_UNSIGNED);
-		how = fxdr_unsigned(int, *tl);
-		switch (how) {
-		case NFSV3CREATE_GUARDED:
-			if (nd.ni_vp) {
-				error = EEXIST;
-				break;
-			}
-			/* fall through */
-		case NFSV3CREATE_UNCHECKED:
-			nfsm_srvsattr(vap);
-			break;
-		case NFSV3CREATE_EXCLUSIVE:
-			tl = nfsm_dissect_nonblock(u_int32_t *,
-			    NFSX_V3CREATEVERF);
-			/* Unique bytes, endianness is not important. */
-			cverf.tv_sec  = (int32_t)tl[0];
-			cverf.tv_nsec = tl[1];
-			exclusive_flag = 1;
-			break;
-		};
-		vap->va_type = VREG;
-	} else {
-		sp = nfsm_dissect_nonblock(struct nfsv2_sattr *, NFSX_V2SATTR);
-		vap->va_type = IFTOVT(fxdr_unsigned(u_int32_t, sp->sa_mode));
-		if (vap->va_type == VNON)
-			vap->va_type = VREG;
-		vap->va_mode = nfstov_mode(sp->sa_mode);
-		switch (vap->va_type) {
-		case VREG:
-			tsize = fxdr_unsigned(int32_t, sp->sa_size);
-			if (tsize != -1)
-				vap->va_size = (u_quad_t)tsize;
-			break;
-		case VCHR:
-		case VBLK:
-		case VFIFO:
-			rdev = fxdr_unsigned(long, sp->sa_size);
-			break;
-		default:
-			break;
-		};
-	}
-
-	/*
-	 * Iff doesn't exist, create it
-	 * otherwise just truncate to 0 length
-	 *   should I set the mode too ?
-	 *
-	 * The only possible error we can have at this point is EEXIST.
-	 * nd.ni_vp will also be non-NULL in that case.
-	 */
-	if (nd.ni_vp == NULL) {
-		if (vap->va_mode == (mode_t)VNOVAL)
-			vap->va_mode = 0;
-		if (vap->va_type == VREG || vap->va_type == VSOCK) {
-			error = VOP_CREATE(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, vap);
-			if (error)
-				NDFREE(&nd, NDF_ONLY_PNBUF);
-			else {
-				if (exclusive_flag) {
-					exclusive_flag = 0;
-					VATTR_NULL(vap);
-					vap->va_atime = cverf;
-					error = VOP_SETATTR(nd.ni_vp, vap,
-					    cred);
-				}
-			}
-		} else if (vap->va_type == VCHR || vap->va_type == VBLK ||
-		    vap->va_type == VFIFO) {
-			/*
-			 * NFSv2-specific code for creating device nodes
-			 * and fifos.
-			 *
-			 * Handle SysV FIFO node special cases.  All other
-			 * devices require super user to access.
-			 */
-			if (vap->va_type == VCHR && rdev == 0xffffffff)
-				vap->va_type = VFIFO;
-                        if (vap->va_type != VFIFO &&
-			    (error = priv_check_cred(cred, PRIV_VFS_MKNOD_DEV,
-			    0))) {
-				goto ereply;
-                        }
-			vap->va_rdev = rdev;
-			error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, vap);
-			if (error) {
-				NDFREE(&nd, NDF_ONLY_PNBUF);
-				goto ereply;
-			}
-			vput(nd.ni_vp);
-			nd.ni_vp = NULL;
-
-			/*
-			 * release dvp prior to lookup
-			 */
-			vput(nd.ni_dvp);
-			nd.ni_dvp = NULL;
-			/*
-			 * Setup for lookup.
-			 *
-			 * Even though LOCKPARENT was cleared, ni_dvp may
-			 * be garbage.
-			 */
-			nd.ni_cnd.cn_nameiop = LOOKUP;
-			nd.ni_cnd.cn_flags &= ~(LOCKPARENT);
-			nd.ni_cnd.cn_thread = curthread;
-			nd.ni_cnd.cn_cred = cred;
-			error = lookup(&nd);
-			nd.ni_dvp = NULL;
-			if (error)
-				goto ereply;
-
-			if (nd.ni_cnd.cn_flags & ISSYMLINK) {
-				error = EINVAL;
-				goto ereply;
-			}
-		} else {
-			error = ENXIO;
-		}
-	} else {
-		if (vap->va_size != -1) {
-			error = nfsrv_access(nd.ni_vp, VWRITE,
-			    cred, (nd.ni_cnd.cn_flags & RDONLY), 0);
-			if (!error) {
-				tempsize = vap->va_size;
-				VATTR_NULL(vap);
-				vap->va_size = tempsize;
-				error = VOP_SETATTR(nd.ni_vp, vap, cred);
-			}
-		}
-	}
-
-	if (!error) {
-		bzero((caddr_t)fhp, sizeof(nfh));
-		fhp->fh_fsid = nd.ni_vp->v_mount->mnt_stat.f_fsid;
-		error = VOP_VPTOFH(nd.ni_vp, &fhp->fh_fid);
-		if (!error)
-			error = VOP_GETATTR(nd.ni_vp, vap, cred);
-	}
-	if (v3) {
-		if (exclusive_flag && !error &&
-		    bcmp(&cverf, &vap->va_atime, sizeof (cverf)))
-			error = EEXIST;
-		if (dirp == nd.ni_dvp)
-			diraft_ret = VOP_GETATTR(dirp, &diraft, cred);
-		else {
-			/* Drop the other locks to avoid deadlock. */
-			if (nd.ni_dvp) {
-				if (nd.ni_dvp == nd.ni_vp)
-					vrele(nd.ni_dvp);
-				else
-					vput(nd.ni_dvp);
-			}
-			if (nd.ni_vp)
-				vput(nd.ni_vp);
-			nd.ni_dvp = NULL;
-			nd.ni_vp = NULL;
-
-			vn_lock(dirp, LK_EXCLUSIVE | LK_RETRY);
-			diraft_ret = VOP_GETATTR(dirp, &diraft, cred);
-			VOP_UNLOCK(dirp, 0);
-		}
-	}
-ereply:
-	nfsm_reply(NFSX_SRVFH(v3) + NFSX_FATTR(v3) + NFSX_WCCDATA(v3));
-	if (v3) {
-		if (!error) {
-			nfsm_srvpostop_fh(fhp);
-			nfsm_srvpostop_attr(0, vap);
-		}
-		nfsm_srvwcc_data(dirfor_ret, &dirfor, diraft_ret, &diraft);
-	} else if (!error) {
-		/* v2 non-error case. */
-		nfsm_srvfhtom(fhp, v3);
-		fp = nfsm_build(struct nfs_fattr *, NFSX_V2FATTR);
-		nfsm_srvfillattr(vap, fp);
-	}
-	error = 0;
-
-nfsmout:
-	if (nd.ni_dvp) {
-		if (nd.ni_dvp == nd.ni_vp)
-			vrele(nd.ni_dvp);
-		else
-			vput(nd.ni_dvp);
-	}
-	if (nd.ni_vp)
-		vput(nd.ni_vp);
-	if (nd.ni_startdir) {
-		vrele(nd.ni_startdir);
-		nd.ni_startdir = NULL;
-	}
-	if (dirp)
-		vrele(dirp);
-	NDFREE(&nd, NDF_ONLY_PNBUF);
-	vn_finished_write(mp);
-	return (error);
-}
-
-/*
- * nfs v3 mknod service
- */
-int
-nfsrv_mknod(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct mbuf **mrq)
-{
-	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
-	struct sockaddr *nam = nfsd->nd_nam;
-	caddr_t dpos = nfsd->nd_dpos;
-	struct ucred *cred = nfsd->nd_cr;
-	struct vattr va, dirfor, diraft;
-	struct vattr *vap = &va;
-	struct thread *td = curthread;
-	u_int32_t *tl;
-	struct nameidata nd;
-	caddr_t bpos;
-	int error = 0, len, dirfor_ret = 1, diraft_ret = 1;
-	u_int32_t major, minor;
-	enum vtype vtyp;
-	struct mbuf *mb, *mreq;
-	struct vnode *vp, *dirp = NULL;
-	nfsfh_t nfh;
-	fhandle_t *fhp;
-	struct mount *mp = NULL;
-	int v3 = (nfsd->nd_flag & ND_NFSV3);
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-	if (!v3)
-		panic("nfsrv_mknod: v3 proc called on a v2 connection");
-	ndclear(&nd);
-
-	fhp = &nfh.fh_generic;
-	nfsm_srvmtofh(fhp);
-	if ((mp = vfs_getvfs(&fhp->fh_fsid)) == NULL) {
-		error = ESTALE;
-		goto ereply;
-	}
-	(void) vn_start_write(NULL, &mp, V_WAIT);
-	vfs_rel(mp);		/* The write holds a ref. */
-	nfsm_srvnamesiz(len);
-
-	nd.ni_cnd.cn_cred = cred;
-	nd.ni_cnd.cn_nameiop = CREATE;
-	nd.ni_cnd.cn_flags = LOCKPARENT | LOCKLEAF | SAVESTART | NOCACHE;
-
-	/*
-	 * Handle nfs_namei() call.  If an error occurs, the nd structure
-	 * is not valid.  However, nfsm_*() routines may still jump to
-	 * nfsmout.
-	 */
-
-	error = nfs_namei(&nd, nfsd, fhp, len, slp, nam, &md, &dpos,
-		&dirp, v3, &dirfor, &dirfor_ret, FALSE);
-	if (error) {
-		nfsm_reply(NFSX_WCCDATA(1));
-		nfsm_srvwcc_data(dirfor_ret, &dirfor, diraft_ret, &diraft);
-		error = 0;
-		goto nfsmout;
-	}
-	tl = nfsm_dissect_nonblock(u_int32_t *, NFSX_UNSIGNED);
-	vtyp = nfsv3tov_type(*tl);
-	if (vtyp != VCHR && vtyp != VBLK && vtyp != VSOCK && vtyp != VFIFO) {
-		error = NFSERR_BADTYPE;
-		goto out;
-	}
-	VATTR_NULL(vap);
-	nfsm_srvsattr(vap);
-	if (vtyp == VCHR || vtyp == VBLK) {
-		tl = nfsm_dissect_nonblock(u_int32_t *, 2 * NFSX_UNSIGNED);
-		major = fxdr_unsigned(u_int32_t, *tl++);
-		minor = fxdr_unsigned(u_int32_t, *tl);
-		vap->va_rdev = makedev(major, minor);
-	}
-
-	/*
-	 * Iff doesn't exist, create it.
-	 */
-	if (nd.ni_vp) {
-		error = EEXIST;
-		goto out;
-	}
-	vap->va_type = vtyp;
-	if (vap->va_mode == (mode_t)VNOVAL)
-		vap->va_mode = 0;
-	if (vtyp == VSOCK) {
-		vrele(nd.ni_startdir);
-		nd.ni_startdir = NULL;
-		error = VOP_CREATE(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, vap);
-		if (error)
-			NDFREE(&nd, NDF_ONLY_PNBUF);
-	} else {
-		if (vtyp != VFIFO && (error = priv_check_cred(cred,
-		    PRIV_VFS_MKNOD_DEV, 0)))
-			goto out;
-		error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, vap);
-		if (error) {
-			NDFREE(&nd, NDF_ONLY_PNBUF);
-			goto out;
-		}
-		vput(nd.ni_vp);
-		nd.ni_vp = NULL;
-
-		/*
-		 * Release dvp prior to lookup
-		 */
-		vput(nd.ni_dvp);
-		nd.ni_dvp = NULL;
-
-		nd.ni_cnd.cn_nameiop = LOOKUP;
-		nd.ni_cnd.cn_flags &= ~(LOCKPARENT);
-		nd.ni_cnd.cn_thread = td;
-		nd.ni_cnd.cn_cred = td->td_ucred;
-		error = lookup(&nd);
-		nd.ni_dvp = NULL;
-
-		if (error)
-			goto out;
-		if (nd.ni_cnd.cn_flags & ISSYMLINK)
-			error = EINVAL;
-	}
-
-	/*
-	 * send response, cleanup, return.
-	 */
-out:
-	vp = nd.ni_vp;
-	if (!error) {
-		bzero((caddr_t)fhp, sizeof(nfh));
-		fhp->fh_fsid = vp->v_mount->mnt_stat.f_fsid;
-		error = VOP_VPTOFH(vp, &fhp->fh_fid);
-		if (!error)
-			error = VOP_GETATTR(vp, vap, cred);
-	}
-	if (nd.ni_dvp) {
-		if (nd.ni_dvp == nd.ni_vp)
-			vrele(nd.ni_dvp);
-		else
-			vput(nd.ni_dvp);
-		nd.ni_dvp = NULL;
-	}
-	if (vp) {
-		vput(vp);
-		vp = NULL;
-		nd.ni_vp = NULL;
-	}
-	if (nd.ni_startdir) {
-		vrele(nd.ni_startdir);
-		nd.ni_startdir = NULL;
-	}
-	NDFREE(&nd, NDF_ONLY_PNBUF);
-	if (dirp) {
-		vn_lock(dirp, LK_EXCLUSIVE | LK_RETRY);
-		diraft_ret = VOP_GETATTR(dirp, &diraft, cred);
-		vput(dirp);
-	}
-ereply:
-	nfsm_reply(NFSX_SRVFH(1) + NFSX_POSTOPATTR(1) + NFSX_WCCDATA(1));
-	if (v3) {
-		if (!error) {
-			nfsm_srvpostop_fh(fhp);
-			nfsm_srvpostop_attr(0, vap);
-		}
-		nfsm_srvwcc_data(dirfor_ret, &dirfor, diraft_ret, &diraft);
-	}
-	vn_finished_write(mp);
-	return (0);
-nfsmout:
-	if (nd.ni_dvp) {
-		if (nd.ni_dvp == nd.ni_vp)
-			vrele(nd.ni_dvp);
-		else
-			vput(nd.ni_dvp);
-	}
-	if (nd.ni_vp)
-		vput(nd.ni_vp);
-	if (dirp)
-		vrele(dirp);
-	if (nd.ni_startdir)
-		vrele(nd.ni_startdir);
-	NDFREE(&nd, NDF_ONLY_PNBUF);
-	vn_finished_write(mp);
-	return (error);
-}
-
-/*
- * nfs remove service
- */
-int
-nfsrv_remove(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct mbuf **mrq)
-{
-	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
-	struct sockaddr *nam = nfsd->nd_nam;
-	caddr_t dpos = nfsd->nd_dpos;
-	struct ucred *cred = nfsd->nd_cr;
-	struct nameidata nd;
-	caddr_t bpos;
-	int error = 0, len, dirfor_ret = 1, diraft_ret = 1;
-	int v3 = (nfsd->nd_flag & ND_NFSV3);
-	struct mbuf *mb, *mreq;
-	struct vnode *dirp;
-	struct vattr dirfor, diraft;
-	nfsfh_t nfh;
-	fhandle_t *fhp;
-	struct mount *mp = NULL;
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-	ndclear(&nd);
-
-	fhp = &nfh.fh_generic;
-	nfsm_srvmtofh(fhp);
-	if ((mp = vfs_getvfs(&fhp->fh_fsid)) == NULL) {
-		error = ESTALE;
-		goto ereply;
-	}
-	(void) vn_start_write(NULL, &mp, V_WAIT);
-	vfs_rel(mp);		/* The write holds a ref. */
-	nfsm_srvnamesiz(len);
-
-	nd.ni_cnd.cn_cred = cred;
-	nd.ni_cnd.cn_nameiop = DELETE;
-	nd.ni_cnd.cn_flags = LOCKPARENT | LOCKLEAF;
-	error = nfs_namei(&nd, nfsd, fhp, len, slp, nam, &md, &dpos,
-		&dirp, v3,  &dirfor, &dirfor_ret, FALSE);
-	if (dirp && !v3) {
-		vrele(dirp);
-		dirp = NULL;
-	}
-	if (error == 0) {
-		if (nd.ni_vp->v_type == VDIR) {
-			error = EPERM;		/* POSIX */
-			goto out;
-		}
-		/*
-		 * The root of a mounted filesystem cannot be deleted.
-		 */
-		if (nd.ni_vp->v_vflag & VV_ROOT) {
-			error = EBUSY;
-			goto out;
-		}
-out:
-		if (!error) {
-			error = VOP_REMOVE(nd.ni_dvp, nd.ni_vp, &nd.ni_cnd);
-			NDFREE(&nd, NDF_ONLY_PNBUF);
-		}
-	}
-	if (dirp && v3) {
-		if (dirp == nd.ni_dvp)
-			diraft_ret = VOP_GETATTR(dirp, &diraft, cred);
-		else {
-			/* Drop the other locks to avoid deadlock. */
-			if (nd.ni_dvp) {
-				if (nd.ni_dvp == nd.ni_vp)
-					vrele(nd.ni_dvp);
-				else
-					vput(nd.ni_dvp);
-			}
-			if (nd.ni_vp)
-				vput(nd.ni_vp);
-			nd.ni_dvp = NULL;
-			nd.ni_vp = NULL;
-
-			vn_lock(dirp, LK_EXCLUSIVE | LK_RETRY);
-			diraft_ret = VOP_GETATTR(dirp, &diraft, cred);
-			VOP_UNLOCK(dirp, 0);
-		}
-		vrele(dirp);
-		dirp = NULL;
-	}
-ereply:
-	nfsm_reply(NFSX_WCCDATA(v3));
-	if (v3)
-		nfsm_srvwcc_data(dirfor_ret, &dirfor, diraft_ret, &diraft);
-	error = 0;
-nfsmout:
-	NDFREE(&nd, NDF_ONLY_PNBUF);
-	if (nd.ni_dvp) {
-		if (nd.ni_dvp == nd.ni_vp)
-			vrele(nd.ni_dvp);
-		else
-			vput(nd.ni_dvp);
-	}
-	if (nd.ni_vp)
-		vput(nd.ni_vp);
-	vn_finished_write(mp);
-	return(error);
-}
-
-/*
- * nfs rename service
- */
-int
-nfsrv_rename(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct mbuf **mrq)
-{
-	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
-	struct sockaddr *nam = nfsd->nd_nam;
-	caddr_t dpos = nfsd->nd_dpos;
-	struct ucred *cred = nfsd->nd_cr;
-	caddr_t bpos;
-	int error = 0, len, len2, fdirfor_ret = 1, fdiraft_ret = 1;
-	int tdirfor_ret = 1, tdiraft_ret = 1;
-	int v3 = (nfsd->nd_flag & ND_NFSV3);
-	struct mbuf *mb, *mreq;
-	struct nameidata fromnd, tond;
-	struct vnode *fvp, *tvp, *tdvp, *fdirp = NULL;
-	struct vnode *tdirp = NULL;
-	struct vattr fdirfor, fdiraft, tdirfor, tdiraft;
-	nfsfh_t fnfh, tnfh;
-	fhandle_t *ffhp, *tfhp;
-	uid_t saved_uid;
-	struct mount *mp = NULL;
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-#ifndef nolint
-	fvp = NULL;
-#endif
-	ffhp = &fnfh.fh_generic;
-	tfhp = &tnfh.fh_generic;
-
-	/*
-	 * Clear fields incase goto nfsmout occurs from macro.
-	 */
-
-	ndclear(&fromnd);
-	ndclear(&tond);
-
-	nfsm_srvmtofh(ffhp);
-	if ((mp = vfs_getvfs(&ffhp->fh_fsid)) == NULL) {
-		error = ESTALE;
-		goto out1;
-	}
-	(void) vn_start_write(NULL, &mp, V_WAIT);
-	vfs_rel(mp);		/* The write holds a ref. */
-	nfsm_srvnamesiz(len);
-	/*
-	 * Remember our original uid so that we can reset cr_uid before
-	 * the second nfs_namei() call, in case it is remapped.
-	 */
-	saved_uid = cred->cr_uid;
-	fromnd.ni_cnd.cn_cred = cred;
-	fromnd.ni_cnd.cn_nameiop = DELETE;
-	fromnd.ni_cnd.cn_flags = WANTPARENT | SAVESTART;
-	error = nfs_namei(&fromnd, nfsd, ffhp, len, slp, nam, &md,
-		&dpos, &fdirp, v3, &fdirfor, &fdirfor_ret, FALSE);
-	if (fdirp && !v3) {
-		vrele(fdirp);
-		fdirp = NULL;
-	}
-	if (error) {
-		nfsm_reply(2 * NFSX_WCCDATA(v3));
-		if (v3) {
-			nfsm_srvwcc_data(fdirfor_ret, &fdirfor, fdiraft_ret, &fdiraft);
-			nfsm_srvwcc_data(tdirfor_ret, &tdirfor, tdiraft_ret, &tdiraft);
-		}
-		error = 0;
-		goto nfsmout;
-	}
-	fvp = fromnd.ni_vp;
-	nfsm_srvmtofh(tfhp);
-	nfsm_srvnamesiz(len2);
-	cred->cr_uid = saved_uid;
-	tond.ni_cnd.cn_cred = cred;
-	tond.ni_cnd.cn_nameiop = RENAME;
-	tond.ni_cnd.cn_flags = LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART;
-	error = nfs_namei(&tond, nfsd, tfhp, len2, slp, nam, &md,
-		&dpos, &tdirp, v3, &tdirfor, &tdirfor_ret, FALSE);
-	if (tdirp && !v3) {
-		vrele(tdirp);
-		tdirp = NULL;
-	}
-	if (error)
-		goto out1;
-
-	tdvp = tond.ni_dvp;
-	tvp = tond.ni_vp;
-	if (tvp != NULL) {
-		if (fvp->v_type == VDIR && tvp->v_type != VDIR) {
-			if (v3)
-				error = EEXIST;
-			else
-				error = EISDIR;
-			goto out;
-		} else if (fvp->v_type != VDIR && tvp->v_type == VDIR) {
-			if (v3)
-				error = EEXIST;
-			else
-				error = ENOTDIR;
-			goto out;
-		}
-		if (tvp->v_type == VDIR && tvp->v_mountedhere) {
-			if (v3)
-				error = EXDEV;
-			else
-				error = ENOTEMPTY;
-			goto out;
-		}
-	}
-	if (fvp->v_type == VDIR && fvp->v_mountedhere) {
-		if (v3)
-			error = EXDEV;
-		else
-			error = ENOTEMPTY;
-		goto out;
-	}
-	if (fvp->v_mount != tdvp->v_mount) {
-		if (v3)
-			error = EXDEV;
-		else
-			error = ENOTEMPTY;
-		goto out;
-	}
-	if (fvp == tdvp) {
-		if (v3)
-			error = EINVAL;
-		else
-			error = ENOTEMPTY;
-	}
-	/*
-	 * If source is the same as the destination (that is the
-	 * same vnode with the same name in the same directory),
-	 * then there is nothing to do.
-	 */
-	if (fvp == tvp && fromnd.ni_dvp == tdvp &&
-	    fromnd.ni_cnd.cn_namelen == tond.ni_cnd.cn_namelen &&
-	    !bcmp(fromnd.ni_cnd.cn_nameptr, tond.ni_cnd.cn_nameptr,
-	      fromnd.ni_cnd.cn_namelen))
-		error = -1;
-out:
-	if (!error) {
-		/*
-		 * The VOP_RENAME function releases all vnode references &
-		 * locks prior to returning so we need to clear the pointers
-		 * to bypass cleanup code later on.
-		 */
-		error = VOP_RENAME(fromnd.ni_dvp, fromnd.ni_vp, &fromnd.ni_cnd,
-				   tond.ni_dvp, tond.ni_vp, &tond.ni_cnd);
-		fromnd.ni_dvp = NULL;
-		fromnd.ni_vp = NULL;
-		tond.ni_dvp = NULL;
-		tond.ni_vp = NULL;
-		if (error) {
-			NDFREE(&fromnd, NDF_ONLY_PNBUF);
-			NDFREE(&tond, NDF_ONLY_PNBUF);
-		}
-	} else {
-		if (error == -1)
-			error = 0;
-	}
-	/* fall through */
-out1:
-	nfsm_reply(2 * NFSX_WCCDATA(v3));
-	if (v3) {
-		/* Release existing locks to prevent deadlock. */
-		if (tond.ni_dvp) {
-			if (tond.ni_dvp == tond.ni_vp)
-				vrele(tond.ni_dvp);
-			else
-				vput(tond.ni_dvp);
-		}
-		if (tond.ni_vp)
-			vput(tond.ni_vp);
-		tond.ni_dvp = NULL;
-		tond.ni_vp = NULL;
-
-		if (fdirp) {
-			vn_lock(fdirp, LK_EXCLUSIVE | LK_RETRY);
-			fdiraft_ret = VOP_GETATTR(fdirp, &fdiraft, cred);
-			VOP_UNLOCK(fdirp, 0);
-		}
-		if (tdirp) {
-			vn_lock(tdirp, LK_EXCLUSIVE | LK_RETRY);
-			tdiraft_ret = VOP_GETATTR(tdirp, &tdiraft, cred);
-			VOP_UNLOCK(tdirp, 0);
-		}
-		nfsm_srvwcc_data(fdirfor_ret, &fdirfor, fdiraft_ret, &fdiraft);
-		nfsm_srvwcc_data(tdirfor_ret, &tdirfor, tdiraft_ret, &tdiraft);
-	}
-	error = 0;
-	/* fall through */
-
-nfsmout:
-	/*
-	 * Clear out tond related fields
-	 */
-	if (tond.ni_dvp) {
-		if (tond.ni_dvp == tond.ni_vp)
-			vrele(tond.ni_dvp);
-		else
-			vput(tond.ni_dvp);
-	}
-	if (tond.ni_vp)
-		vput(tond.ni_vp);
-	if (tdirp)
-		vrele(tdirp);
-	if (tond.ni_startdir)
-		vrele(tond.ni_startdir);
-	NDFREE(&tond, NDF_ONLY_PNBUF);
-	/*
-	 * Clear out fromnd related fields
-	 */
-	if (fdirp)
-		vrele(fdirp);
-	if (fromnd.ni_startdir)
-		vrele(fromnd.ni_startdir);
-	NDFREE(&fromnd, NDF_ONLY_PNBUF);
-	if (fromnd.ni_dvp)
-		vrele(fromnd.ni_dvp);
-	if (fromnd.ni_vp)
-		vrele(fromnd.ni_vp);
-
-	vn_finished_write(mp);
-	return (error);
-}
-
-/*
- * nfs link service
- */
-int
-nfsrv_link(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct mbuf **mrq)
-{
-	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
-	struct sockaddr *nam = nfsd->nd_nam;
-	caddr_t dpos = nfsd->nd_dpos;
-	struct ucred *cred = nfsd->nd_cr;
-	struct nameidata nd;
-	caddr_t bpos;
-	int error = 0, rdonly, len, dirfor_ret = 1, diraft_ret = 1;
-	int getret = 1, v3 = (nfsd->nd_flag & ND_NFSV3);
-	struct mbuf *mb, *mreq;
-	struct vnode *vp = NULL, *xp, *dirp = NULL;
-	struct vattr dirfor, diraft, at;
-	nfsfh_t nfh, dnfh;
-	fhandle_t *fhp, *dfhp;
-	struct mount *mp = NULL;
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-	ndclear(&nd);
-
-	fhp = &nfh.fh_generic;
-	dfhp = &dnfh.fh_generic;
-	nfsm_srvmtofh(fhp);
-	if ((mp = vfs_getvfs(&fhp->fh_fsid)) == NULL) {
-		error = ESTALE;
-		goto ereply;
-	}
-	(void) vn_start_write(NULL, &mp, V_WAIT);
-	vfs_rel(mp);		/* The write holds a ref. */
-	nfsm_srvmtofh(dfhp);
-	nfsm_srvnamesiz(len);
-
-	error = nfsrv_fhtovp(fhp, 0, &vp, nfsd, slp, nam, &rdonly);
-	if (error) {
-		nfsm_reply(NFSX_POSTOPATTR(v3) + NFSX_WCCDATA(v3));
-		if (v3) {
-			nfsm_srvpostop_attr(getret, &at);
-			nfsm_srvwcc_data(dirfor_ret, &dirfor, diraft_ret, &diraft);
-		}
-		vp = NULL;
-		error = 0;
-		goto nfsmout;
-	}
-	if (v3)
-		getret = VOP_GETATTR(vp, &at, cred);
-	if (vp->v_type == VDIR) {
-		error = EPERM;		/* POSIX */
-		goto out1;
-	}
-	VOP_UNLOCK(vp, 0);
-	nd.ni_cnd.cn_cred = cred;
-	nd.ni_cnd.cn_nameiop = CREATE;
-	nd.ni_cnd.cn_flags = LOCKPARENT | NOCACHE;
-	error = nfs_namei(&nd, nfsd, dfhp, len, slp, nam, &md, &dpos,
-		&dirp, v3, &dirfor, &dirfor_ret, FALSE);
-	if (dirp && !v3) {
-		vrele(dirp);
-		dirp = NULL;
-	}
-	if (error) {
-		vrele(vp);
-		vp = NULL;
-		goto out2;
-	}
-	xp = nd.ni_vp;
-	if (xp != NULL) {
-		error = EEXIST;
-		vrele(vp);
-		vp = NULL;
-		goto out2;
-	}
-	xp = nd.ni_dvp;
-	if (vp->v_mount != xp->v_mount) {
-		error = EXDEV;
-		vrele(vp);
-		vp = NULL;
-		goto out2;
-	}
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
-	error = VOP_LINK(nd.ni_dvp, vp, &nd.ni_cnd);
-	NDFREE(&nd, NDF_ONLY_PNBUF);
-	/* fall through */
-
-out1:
-	if (v3)
-		getret = VOP_GETATTR(vp, &at, cred);
-out2:
-	if (dirp) {
-		if (dirp == nd.ni_dvp)
-			diraft_ret = VOP_GETATTR(dirp, &diraft, cred);
-		else {
-			/* Release existing locks to prevent deadlock. */
-			if (nd.ni_dvp) {
-				if (nd.ni_dvp == nd.ni_vp)
-					vrele(nd.ni_dvp);
-				else
-					vput(nd.ni_dvp);
-			}
-			if (nd.ni_vp)
-				vrele(nd.ni_vp);
-			nd.ni_dvp = NULL;
-			nd.ni_vp = NULL;
-
-			vn_lock(dirp, LK_EXCLUSIVE | LK_RETRY);
-			diraft_ret = VOP_GETATTR(dirp, &diraft, cred);
-			VOP_UNLOCK(dirp, 0);
-		}
-	}
-ereply:
-	nfsm_reply(NFSX_POSTOPATTR(v3) + NFSX_WCCDATA(v3));
-	if (v3) {
-		nfsm_srvpostop_attr(getret, &at);
-		nfsm_srvwcc_data(dirfor_ret, &dirfor, diraft_ret, &diraft);
-	}
-	error = 0;
-	/* fall through */
-
-nfsmout:
-	NDFREE(&nd, NDF_ONLY_PNBUF);
-	if (vp)
-		vput(vp);
-	if (nd.ni_dvp) {
-		if (nd.ni_dvp == nd.ni_vp)
-			vrele(nd.ni_dvp);
-		else
-			vput(nd.ni_dvp);
-	}
-	if (dirp)
-		vrele(dirp);
-	if (nd.ni_vp)
-		vrele(nd.ni_vp);
-	vn_finished_write(mp);
-	return(error);
-}
-
-/*
- * nfs symbolic link service
- */
-int
-nfsrv_symlink(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct mbuf **mrq)
-{
-	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
-	struct sockaddr *nam = nfsd->nd_nam;
-	caddr_t dpos = nfsd->nd_dpos;
-	struct ucred *cred = nfsd->nd_cr;
-	struct vattr va, dirfor, diraft;
-	struct nameidata nd;
-	struct vattr *vap = &va;
-	struct nfsv2_sattr *sp;
-	char *bpos, *pathcp = NULL;
-	struct uio io;
-	struct iovec iv;
-	int error = 0, len, len2, dirfor_ret = 1, diraft_ret = 1;
-	int v3 = (nfsd->nd_flag & ND_NFSV3);
-	struct mbuf *mb, *mreq;
-	struct vnode *dirp = NULL;
-	nfsfh_t nfh;
-	fhandle_t *fhp;
-	struct mount *mp = NULL;
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-	ndclear(&nd);
-
-	fhp = &nfh.fh_generic;
-	nfsm_srvmtofh(fhp);
-	if ((mp = vfs_getvfs(&fhp->fh_fsid)) == NULL) {
-		error = ESTALE;
-		goto out;
-	}
-	(void) vn_start_write(NULL, &mp, V_WAIT);
-	vfs_rel(mp);		/* The write holds a ref. */
-	nfsm_srvnamesiz(len);
-	nd.ni_cnd.cn_cred = cred;
-	nd.ni_cnd.cn_nameiop = CREATE;
-	nd.ni_cnd.cn_flags = LOCKPARENT | SAVESTART | NOCACHE;
-	error = nfs_namei(&nd, nfsd, fhp, len, slp, nam, &md, &dpos,
-		&dirp, v3, &dirfor, &dirfor_ret, FALSE);
-	if (error == 0) {
-		VATTR_NULL(vap);
-		if (v3)
-			nfsm_srvsattr(vap);
-		nfsm_srvpathsiz(len2);
-	}
-	if (dirp && !v3) {
-		vrele(dirp);
-		dirp = NULL;
-	}
-	if (error)
-		goto out;
-	pathcp = malloc(len2 + 1, M_TEMP, M_WAITOK);
-	iv.iov_base = pathcp;
-	iv.iov_len = len2;
-	io.uio_resid = len2;
-	io.uio_offset = 0;
-	io.uio_iov = &iv;
-	io.uio_iovcnt = 1;
-	io.uio_segflg = UIO_SYSSPACE;
-	io.uio_rw = UIO_READ;
-	io.uio_td = NULL;
-	nfsm_mtouio(&io, len2);
-	if (!v3) {
-		sp = nfsm_dissect_nonblock(struct nfsv2_sattr *, NFSX_V2SATTR);
-		vap->va_mode = nfstov_mode(sp->sa_mode);
-	}
-	*(pathcp + len2) = '\0';
-	if (nd.ni_vp) {
-		error = EEXIST;
-		goto out;
-	}
-
-	/*
-	 * issue symlink op.  SAVESTART is set so the underlying path component
-	 * is only freed by the VOP if an error occurs.
-	 */
-	if (vap->va_mode == (mode_t)VNOVAL)
-		vap->va_mode = 0;
-	error = VOP_SYMLINK(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, vap, pathcp);
-	if (error)
-		NDFREE(&nd, NDF_ONLY_PNBUF);
-	else
-		vput(nd.ni_vp);
-	nd.ni_vp = NULL;
-	/*
-	 * releases directory prior to potential lookup op.
-	 */
-	vput(nd.ni_dvp);
-	nd.ni_dvp = NULL;
-
-	if (error == 0) {
-	    if (v3) {
-		/*
-		 * Issue lookup.  Leave SAVESTART set so we can easily free
-		 * the name buffer later on.
-		 *
-		 * since LOCKPARENT is not set, ni_dvp will be garbage on
-		 * return whether an error occurs or not.
-		 */
-		nd.ni_cnd.cn_nameiop = LOOKUP;
-		nd.ni_cnd.cn_flags &= ~(LOCKPARENT | FOLLOW);
-		nd.ni_cnd.cn_flags |= (NOFOLLOW | LOCKLEAF);
-		nd.ni_cnd.cn_thread = curthread;
-		nd.ni_cnd.cn_cred = cred;
-		error = lookup(&nd);
-		nd.ni_dvp = NULL;
-
-		if (error == 0) {
-			bzero((caddr_t)fhp, sizeof(nfh));
-			fhp->fh_fsid = nd.ni_vp->v_mount->mnt_stat.f_fsid;
-			error = VOP_VPTOFH(nd.ni_vp, &fhp->fh_fid);
-			if (!error)
-				error = VOP_GETATTR(nd.ni_vp, vap, cred);
-			vput(nd.ni_vp);
-			nd.ni_vp = NULL;
-		}
-	    }
-	}
-out:
-	/*
-	 * These releases aren't strictly required, does even doing them
-	 * make any sense? XXX can nfsm_reply() block?
-	 */
-	if (pathcp) {
-		free(pathcp, M_TEMP);
-		pathcp = NULL;
-	}
-	if (dirp) {
-		vn_lock(dirp, LK_EXCLUSIVE | LK_RETRY);
-		diraft_ret = VOP_GETATTR(dirp, &diraft, cred);
-		VOP_UNLOCK(dirp, 0);
-	}
-	if (nd.ni_startdir) {
-		vrele(nd.ni_startdir);
-		nd.ni_startdir = NULL;
-	}
-	nfsm_reply(NFSX_SRVFH(v3) + NFSX_POSTOPATTR(v3) + NFSX_WCCDATA(v3));
-	if (v3) {
-		if (!error) {
-			nfsm_srvpostop_fh(fhp);
-			nfsm_srvpostop_attr(0, vap);
-		}
-		nfsm_srvwcc_data(dirfor_ret, &dirfor, diraft_ret, &diraft);
-	}
-	error = 0;
-	/* fall through */
-
-nfsmout:
-	NDFREE(&nd, NDF_ONLY_PNBUF);
-	if (nd.ni_dvp) {
-		if (nd.ni_dvp == nd.ni_vp)
-			vrele(nd.ni_dvp);
-		else
-			vput(nd.ni_dvp);
-	}
-	if (nd.ni_vp)
-		vrele(nd.ni_vp);
-	if (nd.ni_startdir)
-		vrele(nd.ni_startdir);
-	if (dirp)
-		vrele(dirp);
-	if (pathcp)
-		free(pathcp, M_TEMP);
-
-	vn_finished_write(mp);
-	return (error);
-}
-
-/*
- * nfs mkdir service
- */
-int
-nfsrv_mkdir(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct mbuf **mrq)
-{
-	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
-	struct sockaddr *nam = nfsd->nd_nam;
-	caddr_t dpos = nfsd->nd_dpos;
-	struct ucred *cred = nfsd->nd_cr;
-	struct vattr va, dirfor, diraft;
-	struct vattr *vap = &va;
-	struct nfs_fattr *fp;
-	struct nameidata nd;
-	u_int32_t *tl;
-	caddr_t bpos;
-	int error = 0, len, dirfor_ret = 1, diraft_ret = 1;
-	int v3 = (nfsd->nd_flag & ND_NFSV3);
-	struct mbuf *mb, *mreq;
-	struct vnode *dirp = NULL;
-	int vpexcl = 0;
-	nfsfh_t nfh;
-	fhandle_t *fhp;
-	struct mount *mp = NULL;
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-	ndclear(&nd);
-
-	fhp = &nfh.fh_generic;
-	nfsm_srvmtofh(fhp);
-	if ((mp = vfs_getvfs(&fhp->fh_fsid)) == NULL) {
-		error = ESTALE;
-		goto out;
-	}
-	(void) vn_start_write(NULL, &mp, V_WAIT);
-	vfs_rel(mp);		/* The write holds a ref. */
-	nfsm_srvnamesiz(len);
-	nd.ni_cnd.cn_cred = cred;
-	nd.ni_cnd.cn_nameiop = CREATE;
-	nd.ni_cnd.cn_flags = LOCKPARENT | NOCACHE;
-
-	error = nfs_namei(&nd, nfsd, fhp, len, slp, nam, &md, &dpos,
-		&dirp, v3, &dirfor, &dirfor_ret, FALSE);
-	if (dirp && !v3) {
-		vrele(dirp);
-		dirp = NULL;
-	}
-	if (error) {
-		nfsm_reply(NFSX_WCCDATA(v3));
-		if (v3)
-			nfsm_srvwcc_data(dirfor_ret, &dirfor, diraft_ret, &diraft);
-		error = 0;
-		goto nfsmout;
-	}
-	VATTR_NULL(vap);
-	if (v3) {
-		nfsm_srvsattr(vap);
-	} else {
-		tl = nfsm_dissect_nonblock(u_int32_t *, NFSX_UNSIGNED);
-		vap->va_mode = nfstov_mode(*tl++);
-	}
-
-	/*
-	 * At this point nd.ni_dvp is referenced and exclusively locked and
-	 * nd.ni_vp, if it exists, is referenced but not locked.
-	 */
-
-	vap->va_type = VDIR;
-	if (nd.ni_vp != NULL) {
-		NDFREE(&nd, NDF_ONLY_PNBUF);
-		error = EEXIST;
-		goto out;
-	}
-
-	/*
-	 * Issue mkdir op.  Since SAVESTART is not set, the pathname
-	 * component is freed by the VOP call.  This will fill-in
-	 * nd.ni_vp, reference, and exclusively lock it.
-	 */
-	if (vap->va_mode == (mode_t)VNOVAL)
-		vap->va_mode = 0;
-	error = VOP_MKDIR(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, vap);
-	NDFREE(&nd, NDF_ONLY_PNBUF);
-	vpexcl = 1;
-
-	vput(nd.ni_dvp);
-	nd.ni_dvp = NULL;
-
-	if (!error) {
-		bzero((caddr_t)fhp, sizeof(nfh));
-		fhp->fh_fsid = nd.ni_vp->v_mount->mnt_stat.f_fsid;
-		error = VOP_VPTOFH(nd.ni_vp, &fhp->fh_fid);
-		if (!error)
-			error = VOP_GETATTR(nd.ni_vp, vap, cred);
-	}
-out:
-	if (dirp) {
-		if (dirp == nd.ni_dvp) {
-			diraft_ret = VOP_GETATTR(dirp, &diraft, cred);
-		} else {
-			/* Release existing locks to prevent deadlock. */
-			if (nd.ni_dvp) {
-				NDFREE(&nd, NDF_ONLY_PNBUF);
-				if (nd.ni_dvp == nd.ni_vp && vpexcl)
-					vrele(nd.ni_dvp);
-				else
-					vput(nd.ni_dvp);
-			}
-			if (nd.ni_vp) {
-				if (vpexcl)
-					vput(nd.ni_vp);
-				else
-					vrele(nd.ni_vp);
-			}
-			nd.ni_dvp = NULL;
-			nd.ni_vp = NULL;
-			vn_lock(dirp, LK_EXCLUSIVE | LK_RETRY);
-			diraft_ret = VOP_GETATTR(dirp, &diraft, cred);
-			VOP_UNLOCK(dirp, 0);
-		}
-	}
-	nfsm_reply(NFSX_SRVFH(v3) + NFSX_POSTOPATTR(v3) + NFSX_WCCDATA(v3));
-	if (v3) {
-		if (!error) {
-			nfsm_srvpostop_fh(fhp);
-			nfsm_srvpostop_attr(0, vap);
-		}
-		nfsm_srvwcc_data(dirfor_ret, &dirfor, diraft_ret, &diraft);
-	} else if (!error) {
-		/* v2 non-error case. */
-		nfsm_srvfhtom(fhp, v3);
-		fp = nfsm_build(struct nfs_fattr *, NFSX_V2FATTR);
-		nfsm_srvfillattr(vap, fp);
-	}
-	error = 0;
-	/* fall through */
-
-nfsmout:
-	if (nd.ni_dvp) {
-		NDFREE(&nd, NDF_ONLY_PNBUF);
-		if (nd.ni_dvp == nd.ni_vp && vpexcl)
-			vrele(nd.ni_dvp);
-		else
-			vput(nd.ni_dvp);
-	}
-	if (nd.ni_vp) {
-		if (vpexcl)
-			vput(nd.ni_vp);
-		else
-			vrele(nd.ni_vp);
-	}
-	if (dirp)
-		vrele(dirp);
-	vn_finished_write(mp);
-	return (error);
-}
-
-/*
- * nfs rmdir service
- */
-int
-nfsrv_rmdir(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct mbuf **mrq)
-{
-	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
-	struct sockaddr *nam = nfsd->nd_nam;
-	caddr_t dpos = nfsd->nd_dpos;
-	struct ucred *cred = nfsd->nd_cr;
-	caddr_t bpos;
-	int error = 0, len, dirfor_ret = 1, diraft_ret = 1;
-	int v3 = (nfsd->nd_flag & ND_NFSV3);
-	struct mbuf *mb, *mreq;
-	struct vnode *vp, *dirp = NULL;
-	struct vattr dirfor, diraft;
-	nfsfh_t nfh;
-	fhandle_t *fhp;
-	struct nameidata nd;
-	struct mount *mp = NULL;
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-	ndclear(&nd);
-
-	fhp = &nfh.fh_generic;
-	nfsm_srvmtofh(fhp);
-	if ((mp = vfs_getvfs(&fhp->fh_fsid)) == NULL) {
-		error = ESTALE;
-		goto out;
-	}
-	(void) vn_start_write(NULL, &mp, V_WAIT);
-	vfs_rel(mp);		/* The write holds a ref. */
-	nfsm_srvnamesiz(len);
-	nd.ni_cnd.cn_cred = cred;
-	nd.ni_cnd.cn_nameiop = DELETE;
-	nd.ni_cnd.cn_flags = LOCKPARENT | LOCKLEAF;
-	error = nfs_namei(&nd, nfsd, fhp, len, slp, nam, &md, &dpos,
-		&dirp, v3, &dirfor, &dirfor_ret, FALSE);
-	if (dirp && !v3) {
-		vrele(dirp);
-		dirp = NULL;
-	}
-	if (error) {
-		nfsm_reply(NFSX_WCCDATA(v3));
-		if (v3)
-			nfsm_srvwcc_data(dirfor_ret, &dirfor, diraft_ret, &diraft);
-		error = 0;
-		goto nfsmout;
-	}
-	vp = nd.ni_vp;
-	if (vp->v_type != VDIR) {
-		error = ENOTDIR;
-		goto out;
-	}
-	/*
-	 * No rmdir "." please.
-	 */
-	if (nd.ni_dvp == vp) {
-		error = EINVAL;
-		goto out;
-	}
-	/*
-	 * The root of a mounted filesystem cannot be deleted.
-	 */
-	if (vp->v_vflag & VV_ROOT)
-		error = EBUSY;
-out:
-	/*
-	 * Issue or abort op.  Since SAVESTART is not set, path name
-	 * component is freed by the VOP after either.
-	 */
-	if (!error)
-		error = VOP_RMDIR(nd.ni_dvp, nd.ni_vp, &nd.ni_cnd);
-	NDFREE(&nd, NDF_ONLY_PNBUF);
-
-	if (dirp) {
-		if (dirp == nd.ni_dvp)
-			diraft_ret = VOP_GETATTR(dirp, &diraft, cred);
-		else {
-			/* Release existing locks to prevent deadlock. */
-			if (nd.ni_dvp) {
-				if (nd.ni_dvp == nd.ni_vp)
-					vrele(nd.ni_dvp);
-				else
-					vput(nd.ni_dvp);
-			}
-			if (nd.ni_vp)
-				vput(nd.ni_vp);
-			nd.ni_dvp = NULL;
-			nd.ni_vp = NULL;
-			vn_lock(dirp, LK_EXCLUSIVE | LK_RETRY);
-			diraft_ret = VOP_GETATTR(dirp, &diraft, cred);
-			VOP_UNLOCK(dirp, 0);
-		}
-	}
-	nfsm_reply(NFSX_WCCDATA(v3));
-	error = 0;
-	if (v3)
-		nfsm_srvwcc_data(dirfor_ret, &dirfor, diraft_ret, &diraft);
-	/* fall through */
-
-nfsmout:
-	NDFREE(&nd, NDF_ONLY_PNBUF);
-	if (nd.ni_dvp) {
-		if (nd.ni_dvp == nd.ni_vp)
-			vrele(nd.ni_dvp);
-		else
-			vput(nd.ni_dvp);
-	}
-	if (nd.ni_vp)
-		vput(nd.ni_vp);
-	if (dirp)
-		vrele(dirp);
-
-	vn_finished_write(mp);
-	return(error);
-}
-
-/*
- * nfs readdir service
- * - mallocs what it thinks is enough to read
- *	count rounded up to a multiple of NFS_DIRBLKSIZ <= NFS_MAXREADDIR
- * - calls VOP_READDIR()
- * - loops around building the reply
- *	if the output generated exceeds count break out of loop
- *	The nfsm_clget macro is used here so that the reply will be packed
- *	tightly in mbuf clusters.
- * - it only knows that it has encountered eof when the VOP_READDIR()
- *	reads nothing
- * - as such one readdir rpc will return eof false although you are there
- *	and then the next will return eof
- * - it trims out records with d_fileno == 0
- *	this doesn't matter for Unix clients, but they might confuse clients
- *	for other os'.
- * NB: It is tempting to set eof to true if the VOP_READDIR() reads less
- *	than requested, but this may not apply to all filesystems. For
- *	example, client NFS does not { although it is never remote mounted
- *	anyhow }
- *     The alternate call nfsrv_readdirplus() does lookups as well.
- * PS: The NFS protocol spec. does not clarify what the "count" byte
- *	argument is a count of.. just name strings and file id's or the
- *	entire reply rpc or ...
- *	I tried just file name and id sizes and it confused the Sun client,
- *	so I am using the full rpc size now. The "paranoia.." comment refers
- *	to including the status longwords that are not a part of the dir.
- *	"entry" structures, but are in the rpc.
- */
-struct flrep {
-	nfsuint64	fl_off;
-	u_int32_t	fl_postopok;
-	u_int32_t	fl_fattr[NFSX_V3FATTR / sizeof (u_int32_t)];
-	u_int32_t	fl_fhok;
-	u_int32_t	fl_fhsize;
-	u_int32_t	fl_nfh[NFSX_V3FH / sizeof (u_int32_t)];
-};
-
-int
-nfsrv_readdir(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct mbuf **mrq)
-{
-	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
-	struct sockaddr *nam = nfsd->nd_nam;
-	caddr_t dpos = nfsd->nd_dpos;
-	struct ucred *cred = nfsd->nd_cr;
-	char *bp, *be;
-	struct mbuf *mp;
-	struct dirent *dp;
-	caddr_t cp;
-	u_int32_t *tl;
-	caddr_t bpos;
-	struct mbuf *mb, *mreq;
-	char *cpos, *cend, *rbuf;
-	struct vnode *vp = NULL;
-	struct vattr at;
-	nfsfh_t nfh;
-	fhandle_t *fhp;
-	struct uio io;
-	struct iovec iv;
-	int len, nlen, rem, xfer, tsiz, i, error = 0, getret = 1;
-	int siz, cnt, fullsiz, eofflag, rdonly, ncookies;
-	int v3 = (nfsd->nd_flag & ND_NFSV3);
-	u_quad_t off, toff, verf;
-	u_long *cookies = NULL, *cookiep; /* needs to be int64_t or off_t */
-	int is_ufs;
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-	fhp = &nfh.fh_generic;
-	nfsm_srvmtofh(fhp);
-	if (v3) {
-		tl = nfsm_dissect_nonblock(u_int32_t *, 5 * NFSX_UNSIGNED);
-		toff = fxdr_hyper(tl);
-		tl += 2;
-		verf = fxdr_hyper(tl);
-		tl += 2;
-	} else {
-		tl = nfsm_dissect_nonblock(u_int32_t *, 2 * NFSX_UNSIGNED);
-		toff = fxdr_unsigned(u_quad_t, *tl++);
-		verf = 0;	/* shut up gcc */
-	}
-	off = toff;
-	cnt = fxdr_unsigned(int, *tl);
-	siz = ((cnt + DIRBLKSIZ - 1) & ~(DIRBLKSIZ - 1));
-	xfer = NFS_SRVMAXDATA(nfsd);
-	if (cnt > xfer)
-		cnt = xfer;
-	if (siz > xfer)
-		siz = xfer;
-	fullsiz = siz;
-	error = nfsrv_fhtovp(fhp, 0, &vp, nfsd, slp, nam, &rdonly);
-	if (!error && vp->v_type != VDIR) {
-		error = ENOTDIR;
-		vput(vp);
-		vp = NULL;
-	}
-	if (error) {
-		nfsm_reply(NFSX_UNSIGNED);
-		if (v3)
-			nfsm_srvpostop_attr(getret, &at);
-		error = 0;
-		goto nfsmout;
-	}
-
-	/*
-	 * Obtain lock on vnode for this section of the code
-	 */
-	if (v3) {
-		error = getret = VOP_GETATTR(vp, &at, cred);
-#if 0
-		/*
-		 * XXX This check may be too strict for Solaris 2.5 clients.
-		 */
-		if (!error && toff && verf && verf != at.va_filerev)
-			error = NFSERR_BAD_COOKIE;
-#endif
-	}
-	if (!error)
-		error = nfsrv_access(vp, VEXEC, cred, rdonly, 0);
-	if (error) {
-		vput(vp);
-		vp = NULL;
-		nfsm_reply(NFSX_POSTOPATTR(v3));
-		if (v3)
-			nfsm_srvpostop_attr(getret, &at);
-		error = 0;
-		goto nfsmout;
-	}
-	is_ufs = strcmp(vp->v_mount->mnt_vfc->vfc_name, "ufs") == 0;
-	VOP_UNLOCK(vp, 0);
-
-	/*
-	 * end section.  Allocate rbuf and continue
-	 */
-	rbuf = malloc(siz, M_TEMP, M_WAITOK);
-again:
-	iv.iov_base = rbuf;
-	iv.iov_len = fullsiz;
-	io.uio_iov = &iv;
-	io.uio_iovcnt = 1;
-	io.uio_offset = (off_t)off;
-	io.uio_resid = fullsiz;
-	io.uio_segflg = UIO_SYSSPACE;
-	io.uio_rw = UIO_READ;
-	io.uio_td = NULL;
-	eofflag = 0;
-	if (cookies) {
-		free((caddr_t)cookies, M_TEMP);
-		cookies = NULL;
-	}
-	vn_lock(vp, LK_SHARED | LK_RETRY);
-	error = VOP_READDIR(vp, &io, cred, &eofflag, &ncookies, &cookies);
-	off = (off_t)io.uio_offset;
-	if (!cookies && !error)
-		error = NFSERR_PERM;
-	if (v3) {
-		getret = VOP_GETATTR(vp, &at, cred);
-		if (!error)
-			error = getret;
-	}
-	VOP_UNLOCK(vp, 0);
-	if (error) {
-		vrele(vp);
-		vp = NULL;
-		free((caddr_t)rbuf, M_TEMP);
-		if (cookies)
-			free((caddr_t)cookies, M_TEMP);
-		nfsm_reply(NFSX_POSTOPATTR(v3));
-		if (v3)
-			nfsm_srvpostop_attr(getret, &at);
-		error = 0;
-		goto nfsmout;
-	}
-	if (io.uio_resid) {
-		siz -= io.uio_resid;
-
-		/*
-		 * If nothing read, return eof
-		 * rpc reply
-		 */
-		if (siz == 0) {
-			vrele(vp);
-			vp = NULL;
-			nfsm_reply(NFSX_POSTOPATTR(v3) + NFSX_COOKIEVERF(v3) +
-				2 * NFSX_UNSIGNED);
-			if (v3) {
-				nfsm_srvpostop_attr(getret, &at);
-				tl = nfsm_build(u_int32_t *, 4 * NFSX_UNSIGNED);
-				txdr_hyper(at.va_filerev, tl);
-				tl += 2;
-			} else
-				tl = nfsm_build(u_int32_t *, 2 * NFSX_UNSIGNED);
-			*tl++ = nfsrv_nfs_false;
-			*tl = nfsrv_nfs_true;
-			free((caddr_t)rbuf, M_TEMP);
-			free((caddr_t)cookies, M_TEMP);
-			error = 0;
-			goto nfsmout;
-		}
-	}
-
-	/*
-	 * Check for degenerate cases of nothing useful read.
-	 * If so go try again
-	 */
-	cpos = rbuf;
-	cend = rbuf + siz;
-	dp = (struct dirent *)cpos;
-	cookiep = cookies;
-	/*
-	 * For some reason FreeBSD's ufs_readdir() chooses to back the
-	 * directory offset up to a block boundary, so it is necessary to
-	 * skip over the records that precede the requested offset. This
-	 * requires the assumption that file offset cookies monotonically
-	 * increase.
-	 */
-	while (cpos < cend && ncookies > 0 &&
-		(dp->d_fileno == 0 || dp->d_type == DT_WHT ||
-		 (is_ufs == 1 && ((u_quad_t)(*cookiep)) <= toff))) {
-		cpos += dp->d_reclen;
-		dp = (struct dirent *)cpos;
-		cookiep++;
-		ncookies--;
-	}
-	if (cpos >= cend || ncookies == 0) {
-		toff = off;
-		siz = fullsiz;
-		goto again;
-	}
-
-	len = 3 * NFSX_UNSIGNED;	/* paranoia, probably can be 0 */
-	nfsm_reply(NFSX_POSTOPATTR(v3) + NFSX_COOKIEVERF(v3) + siz);
-	if (v3) {
-		nfsm_srvpostop_attr(getret, &at);
-		tl = nfsm_build(u_int32_t *, 2 * NFSX_UNSIGNED);
-		txdr_hyper(at.va_filerev, tl);
-	}
-	mp = mb;
-	bp = bpos;
-	be = bp + M_TRAILINGSPACE(mp);
-
-	/* Loop through the records and build reply */
-	while (cpos < cend && ncookies > 0) {
-		if (dp->d_fileno != 0 && dp->d_type != DT_WHT) {
-			nlen = dp->d_namlen;
-			rem = nfsm_rndup(nlen) - nlen;
-			len += (4 * NFSX_UNSIGNED + nlen + rem);
-			if (v3)
-				len += 2 * NFSX_UNSIGNED;
-			if (len > cnt) {
-				eofflag = 0;
-				break;
-			}
-			/*
-			 * Build the directory record xdr from
-			 * the dirent entry.
-			 */
-			nfsm_clget;
-			*tl = nfsrv_nfs_true;
-			bp += NFSX_UNSIGNED;
-			if (v3) {
-				nfsm_clget;
-				*tl = 0;
-				bp += NFSX_UNSIGNED;
-			}
-			nfsm_clget;
-			*tl = txdr_unsigned(dp->d_fileno);
-			bp += NFSX_UNSIGNED;
-			nfsm_clget;
-			*tl = txdr_unsigned(nlen);
-			bp += NFSX_UNSIGNED;
-
-			/* And loop around copying the name */
-			xfer = nlen;
-			cp = dp->d_name;
-			while (xfer > 0) {
-				nfsm_clget;
-				if ((bp+xfer) > be)
-					tsiz = be-bp;
-				else
-					tsiz = xfer;
-				bcopy(cp, bp, tsiz);
-				bp += tsiz;
-				xfer -= tsiz;
-				if (xfer > 0)
-					cp += tsiz;
-			}
-			/* And null pad to an int32_t boundary. */
-			for (i = 0; i < rem; i++)
-				*bp++ = '\0';
-			nfsm_clget;
-
-			/* Finish off the record */
-			if (v3) {
-				*tl = 0;
-				bp += NFSX_UNSIGNED;
-				nfsm_clget;
-			}
-			*tl = txdr_unsigned(*cookiep);
-			bp += NFSX_UNSIGNED;
-		}
-		cpos += dp->d_reclen;
-		dp = (struct dirent *)cpos;
-		cookiep++;
-		ncookies--;
-	}
-	vrele(vp);
-	vp = NULL;
-	nfsm_clget;
-	*tl = nfsrv_nfs_false;
-	bp += NFSX_UNSIGNED;
-	nfsm_clget;
-	if (eofflag)
-		*tl = nfsrv_nfs_true;
-	else
-		*tl = nfsrv_nfs_false;
-	bp += NFSX_UNSIGNED;
-	if (mp != mb) {
-		if (bp < be)
-			mp->m_len = bp - mtod(mp, caddr_t);
-	} else
-		mp->m_len += bp - bpos;
-	free((caddr_t)rbuf, M_TEMP);
-	free((caddr_t)cookies, M_TEMP);
-
-nfsmout:
-	if (vp)
-		vrele(vp);
-	return(error);
-}
-
-int
-nfsrv_readdirplus(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct mbuf **mrq)
-{
-	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
-	struct sockaddr *nam = nfsd->nd_nam;
-	caddr_t dpos = nfsd->nd_dpos;
-	struct ucred *cred = nfsd->nd_cr;
-	char *bp, *be;
-	struct mbuf *mp;
-	struct dirent *dp;
-	caddr_t cp;
-	u_int32_t *tl;
-	caddr_t bpos;
-	struct mbuf *mb, *mreq;
-	char *cpos, *cend, *rbuf;
-	struct vnode *vp = NULL, *nvp;
-	struct flrep fl;
-	nfsfh_t nfh;
-	fhandle_t *fhp, *nfhp = (fhandle_t *)fl.fl_nfh;
-	struct uio io;
-	struct iovec iv;
-	struct vattr va, at, *vap = &va;
-	struct nfs_fattr *fp;
-	int len, nlen, rem, xfer, tsiz, i, error = 0, error1, getret = 1;
-	int vp_locked;
-	int siz, cnt, fullsiz, eofflag, rdonly, dirlen, ncookies;
-	u_quad_t off, toff, verf;
-	u_long *cookies = NULL, *cookiep; /* needs to be int64_t or off_t */
-	int v3 = (nfsd->nd_flag & ND_NFSV3);
-	int usevget = 1;
-	struct componentname cn;
-	struct mount *mntp = NULL;
-	int is_ufs;
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-	vp_locked = 0;
-	if (!v3)
-		panic("nfsrv_readdirplus: v3 proc called on a v2 connection");
-	fhp = &nfh.fh_generic;
-	nfsm_srvmtofh(fhp);
-	tl = nfsm_dissect_nonblock(u_int32_t *, 6 * NFSX_UNSIGNED);
-	toff = fxdr_hyper(tl);
-	tl += 2;
-	verf = fxdr_hyper(tl);
-	tl += 2;
-	siz = fxdr_unsigned(int, *tl++);
-	cnt = fxdr_unsigned(int, *tl);
-	off = toff;
-	siz = ((siz + DIRBLKSIZ - 1) & ~(DIRBLKSIZ - 1));
-	xfer = NFS_SRVMAXDATA(nfsd);
-	if (cnt > xfer)
-		cnt = xfer;
-	if (siz > xfer)
-		siz = xfer;
-	fullsiz = siz;
-	error = nfsrv_fhtovp(fhp, NFSRV_FLAG_BUSY, &vp, nfsd, slp,
-	    nam, &rdonly);
-	if (!error) {
-		vp_locked = 1;
-		mntp = vp->v_mount;
-		if (vp->v_type != VDIR) {
-			error = ENOTDIR;
-			vput(vp);
-			vp = NULL;
-			vp_locked = 0;
-		}
-	}
-	if (error) {
-		nfsm_reply(NFSX_UNSIGNED);
-		nfsm_srvpostop_attr(getret, &at);
-		error = 0;
-		goto nfsmout;
-	}
-	error = getret = VOP_GETATTR(vp, &at, cred);
-#if 0
-	/*
-	 * XXX This check may be too strict for Solaris 2.5 clients.
-	 */
-	if (!error && toff && verf && verf != at.va_filerev)
-		error = NFSERR_BAD_COOKIE;
-#endif
-	if (!error)
-		error = nfsrv_access(vp, VEXEC, cred, rdonly, 0);
-	if (error) {
-		vput(vp);
-		vp_locked = 0;
-		vp = NULL;
-		nfsm_reply(NFSX_V3POSTOPATTR);
-		nfsm_srvpostop_attr(getret, &at);
-		error = 0;
-		goto nfsmout;
-	}
-	is_ufs = strcmp(vp->v_mount->mnt_vfc->vfc_name, "ufs") == 0;
-	VOP_UNLOCK(vp, 0);
-	vp_locked = 0;
-	rbuf = malloc(siz, M_TEMP, M_WAITOK);
-again:
-	iv.iov_base = rbuf;
-	iv.iov_len = fullsiz;
-	io.uio_iov = &iv;
-	io.uio_iovcnt = 1;
-	io.uio_offset = (off_t)off;
-	io.uio_resid = fullsiz;
-	io.uio_segflg = UIO_SYSSPACE;
-	io.uio_rw = UIO_READ;
-	io.uio_td = NULL;
-	eofflag = 0;
-	vp_locked = 1;
-	if (cookies) {
-		free((caddr_t)cookies, M_TEMP);
-		cookies = NULL;
-	}
-	vn_lock(vp, LK_SHARED | LK_RETRY);
-	error = VOP_READDIR(vp, &io, cred, &eofflag, &ncookies, &cookies);
-	off = (u_quad_t)io.uio_offset;
-	getret = VOP_GETATTR(vp, &at, cred);
-	VOP_UNLOCK(vp, 0);
-	vp_locked = 0;
-	if (!cookies && !error)
-		error = NFSERR_PERM;
-	if (!error)
-		error = getret;
-	if (error) {
-		vrele(vp);
-		vp = NULL;
-		if (cookies)
-			free((caddr_t)cookies, M_TEMP);
-		free((caddr_t)rbuf, M_TEMP);
-		nfsm_reply(NFSX_V3POSTOPATTR);
-		nfsm_srvpostop_attr(getret, &at);
-		error = 0;
-		goto nfsmout;
-	}
-	if (io.uio_resid) {
-		siz -= io.uio_resid;
-
-		/*
-		 * If nothing read, return eof
-		 * rpc reply
-		 */
-		if (siz == 0) {
-			vrele(vp);
-			vp = NULL;
-			nfsm_reply(NFSX_V3POSTOPATTR + NFSX_V3COOKIEVERF +
-				2 * NFSX_UNSIGNED);
-			nfsm_srvpostop_attr(getret, &at);
-			tl = nfsm_build(u_int32_t *, 4 * NFSX_UNSIGNED);
-			txdr_hyper(at.va_filerev, tl);
-			tl += 2;
-			*tl++ = nfsrv_nfs_false;
-			*tl = nfsrv_nfs_true;
-			free((caddr_t)cookies, M_TEMP);
-			free((caddr_t)rbuf, M_TEMP);
-			error = 0;
-			goto nfsmout;
-		}
-	}
-
-	/*
-	 * Check for degenerate cases of nothing useful read.
-	 * If so go try again
-	 */
-	cpos = rbuf;
-	cend = rbuf + siz;
-	dp = (struct dirent *)cpos;
-	cookiep = cookies;
-	/*
-	 * For some reason FreeBSD's ufs_readdir() chooses to back the
-	 * directory offset up to a block boundary, so it is necessary to
-	 * skip over the records that precede the requested offset. This
-	 * requires the assumption that file offset cookies monotonically
-	 * increase.
-	 */
-	while (cpos < cend && ncookies > 0 &&
-		(dp->d_fileno == 0 || dp->d_type == DT_WHT ||
-		 (is_ufs == 1 && ((u_quad_t)(*cookiep)) <= toff))) {
-		cpos += dp->d_reclen;
-		dp = (struct dirent *)cpos;
-		cookiep++;
-		ncookies--;
-	}
-	if (cpos >= cend || ncookies == 0) {
-		toff = off;
-		siz = fullsiz;
-		goto again;
-	}
-
-	dirlen = len = NFSX_V3POSTOPATTR + NFSX_V3COOKIEVERF +
-	    2 * NFSX_UNSIGNED;
-	nfsm_reply(cnt);
-	nfsm_srvpostop_attr(getret, &at);
-	tl = nfsm_build(u_int32_t *, 2 * NFSX_UNSIGNED);
-	txdr_hyper(at.va_filerev, tl);
-	mp = mb;
-	bp = bpos;
-	be = bp + M_TRAILINGSPACE(mp);
-
-	/* Loop through the records and build reply */
-	while (cpos < cend && ncookies > 0) {
-		if (dp->d_fileno != 0 && dp->d_type != DT_WHT) {
-			nlen = dp->d_namlen;
-			rem = nfsm_rndup(nlen)-nlen;
-
-			if (usevget) {
-				/*
-				 * For readdir_and_lookup get the vnode using
-				 * the file number.
-				 */
-				error = VFS_VGET(mntp, dp->d_fileno, LK_SHARED,
-				    &nvp);
-				if (error != 0 && error != EOPNOTSUPP) {
-					error = 0;
-					goto invalid;
-				} else if (error == EOPNOTSUPP) {
-					/*
-					 * VFS_VGET() not supported?
-					 * Let's switch to VOP_LOOKUP().
-					 */
-					error = 0;
-					usevget = 0;
-					cn.cn_nameiop = LOOKUP;
-					cn.cn_flags = ISLASTCN | NOFOLLOW | \
-					    LOCKSHARED | LOCKLEAF;
-					cn.cn_lkflags = LK_SHARED | LK_RETRY;
-					cn.cn_cred = cred;
-					cn.cn_thread = curthread;
-				}
-			}
-			if (!usevget) {
-				cn.cn_nameptr = dp->d_name;
-				cn.cn_namelen = dp->d_namlen;
-				if (dp->d_namlen == 2 &&
-				    dp->d_name[0] == '.' &&
-				    dp->d_name[1] == '.') {
-					cn.cn_flags |= ISDOTDOT;
-				} else {
-					cn.cn_flags &= ~ISDOTDOT;
-				}
-				if (!vp_locked) {
-					vn_lock(vp, LK_SHARED | LK_RETRY);
-					vp_locked = 1;
-				}
-				if ((vp->v_vflag & VV_ROOT) != 0 &&
-				    (cn.cn_flags & ISDOTDOT) != 0) {
-					vref(vp);
-					nvp = vp;
-				} else if (VOP_LOOKUP(vp, &nvp, &cn) != 0)
-					goto invalid;
-			}
-
-			bzero((caddr_t)nfhp, NFSX_V3FH);
-			nfhp->fh_fsid = nvp->v_mount->mnt_stat.f_fsid;
-			if ((error1 = VOP_VPTOFH(nvp, &nfhp->fh_fid)) == 0)
-				error1 = VOP_GETATTR(nvp, vap, cred);
-			if (!usevget && vp == nvp)
-				vunref(nvp);
-			else
-				vput(nvp);
-			nvp = NULL;
-			if (error1 != 0)
-				goto invalid;
-
-			/*
-			 * If either the dircount or maxcount will be
-			 * exceeded, get out now. Both of these lengths
-			 * are calculated conservatively, including all
-			 * XDR overheads.
-			 */
-			len += (8 * NFSX_UNSIGNED + nlen + rem + NFSX_V3FH +
-				NFSX_V3POSTOPATTR);
-			dirlen += (6 * NFSX_UNSIGNED + nlen + rem);
-			if (len > cnt || dirlen > fullsiz) {
-				eofflag = 0;
-				break;
-			}
-
-			/*
-			 * Build the directory record xdr from
-			 * the dirent entry.
-			 */
-			fp = (struct nfs_fattr *)&fl.fl_fattr;
-			nfsm_srvfillattr(vap, fp);
-			fl.fl_fhsize = txdr_unsigned(NFSX_V3FH);
-			fl.fl_fhok = nfsrv_nfs_true;
-			fl.fl_postopok = nfsrv_nfs_true;
-			fl.fl_off.nfsuquad[0] = 0;
-			fl.fl_off.nfsuquad[1] = txdr_unsigned(*cookiep);
-
-			nfsm_clget;
-			*tl = nfsrv_nfs_true;
-			bp += NFSX_UNSIGNED;
-			nfsm_clget;
-			*tl = 0;
-			bp += NFSX_UNSIGNED;
-			nfsm_clget;
-			*tl = txdr_unsigned(dp->d_fileno);
-			bp += NFSX_UNSIGNED;
-			nfsm_clget;
-			*tl = txdr_unsigned(nlen);
-			bp += NFSX_UNSIGNED;
-
-			/* And loop around copying the name */
-			xfer = nlen;
-			cp = dp->d_name;
-			while (xfer > 0) {
-				nfsm_clget;
-				if ((bp + xfer) > be)
-					tsiz = be - bp;
-				else
-					tsiz = xfer;
-				bcopy(cp, bp, tsiz);
-				bp += tsiz;
-				xfer -= tsiz;
-				if (xfer > 0)
-					cp += tsiz;
-			}
-			/* And null pad to an int32_t boundary. */
-			for (i = 0; i < rem; i++)
-				*bp++ = '\0';
-
-			/*
-			 * Now copy the flrep structure out.
-			 */
-			xfer = sizeof (struct flrep);
-			cp = (caddr_t)&fl;
-			while (xfer > 0) {
-				nfsm_clget;
-				if ((bp + xfer) > be)
-					tsiz = be - bp;
-				else
-					tsiz = xfer;
-				bcopy(cp, bp, tsiz);
-				bp += tsiz;
-				xfer -= tsiz;
-				if (xfer > 0)
-					cp += tsiz;
-			}
-		}
-invalid:
-		cpos += dp->d_reclen;
-		dp = (struct dirent *)cpos;
-		cookiep++;
-		ncookies--;
-	}
-	if (!usevget && vp_locked)
-		vput(vp);
-	else
-		vrele(vp);
-	vp = NULL;
-	nfsm_clget;
-	*tl = nfsrv_nfs_false;
-	bp += NFSX_UNSIGNED;
-	nfsm_clget;
-	if (eofflag)
-		*tl = nfsrv_nfs_true;
-	else
-		*tl = nfsrv_nfs_false;
-	bp += NFSX_UNSIGNED;
-	if (mp != mb) {
-		if (bp < be)
-			mp->m_len = bp - mtod(mp, caddr_t);
-	} else
-		mp->m_len += bp - bpos;
-	free((caddr_t)cookies, M_TEMP);
-	free((caddr_t)rbuf, M_TEMP);
-nfsmout:
-	if (vp)
-		vrele(vp);
-	if (mntp)
-		vfs_unbusy(mntp);
-	return(error);
-}
-
-/*
- * nfs commit service
- */
-int
-nfsrv_commit(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct mbuf **mrq)
-{
-	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
-	struct sockaddr *nam = nfsd->nd_nam;
-	caddr_t dpos = nfsd->nd_dpos;
-	struct ucred *cred = nfsd->nd_cr;
-	struct vattr bfor, aft;
-	struct vnode *vp = NULL;
-	nfsfh_t nfh;
-	fhandle_t *fhp;
-	u_int32_t *tl;
-	caddr_t bpos;
-	int error = 0, rdonly, for_ret = 1, aft_ret = 1, cnt;
-	struct mbuf *mb, *mreq;
-	u_quad_t off;
-	struct mount *mp = NULL;
-	int v3 = (nfsd->nd_flag & ND_NFSV3);
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-	if (!v3)
-		panic("nfsrv_commit: v3 proc called on a v2 connection");
-	fhp = &nfh.fh_generic;
-	nfsm_srvmtofh(fhp);
-	if ((mp = vfs_getvfs(&fhp->fh_fsid)) == NULL) {
-		error = ESTALE;
-		goto ereply;
-	}
-	(void) vn_start_write(NULL, &mp, V_WAIT);
-	vfs_rel(mp);		/* The write holds a ref. */
-	tl = nfsm_dissect_nonblock(u_int32_t *, 3 * NFSX_UNSIGNED);
-
-	/*
-	 * XXX At this time VOP_FSYNC() does not accept offset and byte
-	 * count parameters, so these arguments are useless (someday maybe).
-	 */
-	off = fxdr_hyper(tl);
-	tl += 2;
-	cnt = fxdr_unsigned(int, *tl);
-	error = nfsrv_fhtovp(fhp, 0, &vp, nfsd, slp, nam, &rdonly);
-	if (error) {
-		nfsm_reply(2 * NFSX_UNSIGNED);
-		nfsm_srvwcc_data(for_ret, &bfor, aft_ret, &aft);
-		error = 0;
-		goto nfsmout;
-	}
-	for_ret = VOP_GETATTR(vp, &bfor, cred);
-
-	/*
-	 * RFC 1813 3.3.21: if count is 0, a flush from offset to the end of file
-	 * is done.  At this time VOP_FSYNC does not accept offset and byte count
-	 * parameters so call VOP_FSYNC the whole file for now.
-	 */
-	if (cnt == 0 || cnt > MAX_COMMIT_COUNT) {
-		/*
-		 * Give up and do the whole thing
-		 */
-		if (vp->v_object &&
-		   (vp->v_object->flags & OBJ_MIGHTBEDIRTY)) {
-			VM_OBJECT_WLOCK(vp->v_object);
-			vm_object_page_clean(vp->v_object, 0, 0, OBJPC_SYNC);
-			VM_OBJECT_WUNLOCK(vp->v_object);
-		}
-		error = VOP_FSYNC(vp, MNT_WAIT, curthread);
-	} else {
-		/*
-		 * Locate and synchronously write any buffers that fall
-		 * into the requested range.  Note:  we are assuming that
-		 * f_iosize is a power of 2.
-		 */
-		int iosize = vp->v_mount->mnt_stat.f_iosize;
-		int iomask = iosize - 1;
-		struct bufobj *bo;
-		daddr_t lblkno;
-
-		/*
-		 * Align to iosize boundry, super-align to page boundry.
-		 */
-		if (off & iomask) {
-			cnt += off & iomask;
-			off &= ~(u_quad_t)iomask;
-		}
-		if (off & PAGE_MASK) {
-			cnt += off & PAGE_MASK;
-			off &= ~(u_quad_t)PAGE_MASK;
-		}
-		lblkno = off / iosize;
-
-		if (vp->v_object &&
-		   (vp->v_object->flags & OBJ_MIGHTBEDIRTY)) {
-			VM_OBJECT_WLOCK(vp->v_object);
-			vm_object_page_clean(vp->v_object, off, off + cnt,
-			    OBJPC_SYNC);
-			VM_OBJECT_WUNLOCK(vp->v_object);
-		}
-
-		bo = &vp->v_bufobj;
-		BO_LOCK(bo);
-		while (cnt > 0) {
-			struct buf *bp;
-
-			/*
-			 * If we have a buffer and it is marked B_DELWRI we
-			 * have to lock and write it.  Otherwise the prior
-			 * write is assumed to have already been committed.
-			 *
-			 * gbincore() can return invalid buffers now so we
-			 * have to check that bit as well (though B_DELWRI
-			 * should not be set if B_INVAL is set there could be
-			 * a race here since we haven't locked the buffer).
-			 */
-			if ((bp = gbincore(&vp->v_bufobj, lblkno)) != NULL) {
-				if (BUF_LOCK(bp, LK_EXCLUSIVE | LK_SLEEPFAIL |
-				    LK_INTERLOCK, BO_LOCKPTR(bo)) == ENOLCK) {
-					BO_LOCK(bo);
-					continue; /* retry */
-				}
-			    	if ((bp->b_flags & (B_DELWRI|B_INVAL)) ==
-				    B_DELWRI) {
-					bremfree(bp);
-					bp->b_flags &= ~B_ASYNC;
-					bwrite(bp);
-					++nfs_commit_miss;
-				} else
-					BUF_UNLOCK(bp);
-				BO_LOCK(bo);
-			}
-			++nfs_commit_blks;
-			if (cnt < iosize)
-				break;
-			cnt -= iosize;
-			++lblkno;
-		}
-		BO_UNLOCK(bo);
-	}
-
-	aft_ret = VOP_GETATTR(vp, &aft, cred);
-	vput(vp);
-	vp = NULL;
-ereply:
-	nfsm_reply(NFSX_V3WCCDATA + NFSX_V3WRITEVERF);
-	nfsm_srvwcc_data(for_ret, &bfor, aft_ret, &aft);
-	if (!error) {
-		tl = nfsm_build(u_int32_t *, NFSX_V3WRITEVERF);
-		if (nfsver.tv_sec == 0)
-			nfsver = boottime;
-		*tl++ = txdr_unsigned(nfsver.tv_sec);
-		*tl = txdr_unsigned(nfsver.tv_usec);
-	} else {
-		error = 0;
-	}
-nfsmout:
-	if (vp)
-		vput(vp);
-	vn_finished_write(mp);
-	return(error);
-}
-
-/*
- * nfs statfs service
- */
-int
-nfsrv_statfs(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct mbuf **mrq)
-{
-	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
-	struct sockaddr *nam = nfsd->nd_nam;
-	caddr_t dpos = nfsd->nd_dpos;
-	struct ucred *cred = nfsd->nd_cr;
-	struct statfs *sf;
-	struct nfs_statfs *sfp;
-	caddr_t bpos;
-	int error = 0, rdonly, getret = 1;
-	int v3 = (nfsd->nd_flag & ND_NFSV3);
-	struct mbuf *mb, *mreq;
-	struct vnode *vp = NULL;
-	struct vattr at;
-	nfsfh_t nfh;
-	fhandle_t *fhp;
-	struct statfs statfs;
-	u_quad_t tval;
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-	fhp = &nfh.fh_generic;
-	nfsm_srvmtofh(fhp);
-	error = nfsrv_fhtovp(fhp, 0, &vp, nfsd, slp, nam, &rdonly);
-	if (error) {
-		nfsm_reply(NFSX_UNSIGNED);
-		if (v3)
-			nfsm_srvpostop_attr(getret, &at);
-		error = 0;
-		goto nfsmout;
-	}
-	sf = &statfs;
-	error = VFS_STATFS(vp->v_mount, sf);
-	getret = VOP_GETATTR(vp, &at, cred);
-	vput(vp);
-	vp = NULL;
-	nfsm_reply(NFSX_POSTOPATTR(v3) + NFSX_STATFS(v3));
-	if (v3)
-		nfsm_srvpostop_attr(getret, &at);
-	if (error) {
-		error = 0;
-		goto nfsmout;
-	}
-	sfp = nfsm_build(struct nfs_statfs *, NFSX_STATFS(v3));
-	if (v3) {
-		tval = (u_quad_t)sf->f_blocks;
-		tval *= (u_quad_t)sf->f_bsize;
-		txdr_hyper(tval, &sfp->sf_tbytes);
-		tval = (u_quad_t)sf->f_bfree;
-		tval *= (u_quad_t)sf->f_bsize;
-		txdr_hyper(tval, &sfp->sf_fbytes);
-		/*
-		 * Don't send negative values for available space,
-		 * since this field is unsigned in the NFS protocol.
-		 * Otherwise, the client would see absurdly high
-		 * numbers for free space.
-		 */
-		if (sf->f_bavail < 0)
-			tval = 0;
-		else
-			tval = (u_quad_t)sf->f_bavail;
-		tval *= (u_quad_t)sf->f_bsize;
-		txdr_hyper(tval, &sfp->sf_abytes);
-		sfp->sf_tfiles.nfsuquad[0] = 0;
-		sfp->sf_tfiles.nfsuquad[1] = txdr_unsigned(sf->f_files);
-		sfp->sf_ffiles.nfsuquad[0] = 0;
-		sfp->sf_ffiles.nfsuquad[1] = txdr_unsigned(sf->f_ffree);
-		sfp->sf_afiles.nfsuquad[0] = 0;
-		sfp->sf_afiles.nfsuquad[1] = txdr_unsigned(sf->f_ffree);
-		sfp->sf_invarsec = 0;
-	} else {
-		sfp->sf_tsize = txdr_unsigned(NFS_MAXDGRAMDATA);
-		sfp->sf_bsize = txdr_unsigned(sf->f_bsize);
-		sfp->sf_blocks = txdr_unsigned(sf->f_blocks);
-		sfp->sf_bfree = txdr_unsigned(sf->f_bfree);
-		if (sf->f_bavail < 0)
-			sfp->sf_bavail = 0;
-		else
-			sfp->sf_bavail = txdr_unsigned(sf->f_bavail);
-	}
-nfsmout:
-	if (vp)
-		vput(vp);
-	return(error);
-}
-
-/*
- * nfs fsinfo service
- */
-int
-nfsrv_fsinfo(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct mbuf **mrq)
-{
-	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
-	struct sockaddr *nam = nfsd->nd_nam;
-	caddr_t dpos = nfsd->nd_dpos;
-	struct ucred *cred = nfsd->nd_cr;
-	struct nfsv3_fsinfo *sip;
-	caddr_t bpos;
-	int error = 0, rdonly, getret = 1, pref;
-	struct mbuf *mb, *mreq;
-	struct vnode *vp = NULL;
-	struct vattr at;
-	nfsfh_t nfh;
-	fhandle_t *fhp;
-	u_quad_t maxfsize;
-	struct statfs sb;
-	int v3 = (nfsd->nd_flag & ND_NFSV3);
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-	if (!v3)
-		panic("nfsrv_fsinfo: v3 proc called on a v2 connection");
-	fhp = &nfh.fh_generic;
-	nfsm_srvmtofh(fhp);
-	error = nfsrv_fhtovp(fhp, 0, &vp, nfsd, slp, nam, &rdonly);
-	if (error) {
-		nfsm_reply(NFSX_UNSIGNED);
-		nfsm_srvpostop_attr(getret, &at);
-		error = 0;
-		goto nfsmout;
-	}
-
-	/* XXX Try to make a guess on the max file size. */
-	VFS_STATFS(vp->v_mount, &sb);
-	maxfsize = (u_quad_t)0x80000000 * sb.f_bsize - 1;
-
-	getret = VOP_GETATTR(vp, &at, cred);
-	vput(vp);
-	vp = NULL;
-	nfsm_reply(NFSX_V3POSTOPATTR + NFSX_V3FSINFO);
-	nfsm_srvpostop_attr(getret, &at);
-	sip = nfsm_build(struct nfsv3_fsinfo *, NFSX_V3FSINFO);
-
-	/*
-	 * XXX
-	 * There should be filesystem VFS OP(s) to get this information.
-	 * For now, assume ufs.
-	 */
-	pref = NFS_SRVMAXDATA(nfsd);
-	sip->fs_rtmax = txdr_unsigned(pref);
-	sip->fs_rtpref = txdr_unsigned(pref);
-	sip->fs_rtmult = txdr_unsigned(NFS_FABLKSIZE);
-	sip->fs_wtmax = txdr_unsigned(pref);
-	sip->fs_wtpref = txdr_unsigned(pref);
-	sip->fs_wtmult = txdr_unsigned(NFS_FABLKSIZE);
-	sip->fs_dtpref = txdr_unsigned(pref);
-	txdr_hyper(maxfsize, &sip->fs_maxfilesize);
-	sip->fs_timedelta.nfsv3_sec = 0;
-	sip->fs_timedelta.nfsv3_nsec = txdr_unsigned(1);
-	sip->fs_properties = txdr_unsigned(NFSV3FSINFO_LINK |
-		NFSV3FSINFO_SYMLINK | NFSV3FSINFO_HOMOGENEOUS |
-		NFSV3FSINFO_CANSETTIME);
-nfsmout:
-	if (vp)
-		vput(vp);
-	return(error);
-}
-
-/*
- * nfs pathconf service
- */
-int
-nfsrv_pathconf(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct mbuf **mrq)
-{
-	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
-	struct sockaddr *nam = nfsd->nd_nam;
-	caddr_t dpos = nfsd->nd_dpos;
-	struct ucred *cred = nfsd->nd_cr;
-	struct nfsv3_pathconf *pc;
-	caddr_t bpos;
-	int error = 0, rdonly, getret = 1;
-	register_t linkmax, namemax, chownres, notrunc;
-	struct mbuf *mb, *mreq;
-	struct vnode *vp = NULL;
-	struct vattr at;
-	nfsfh_t nfh;
-	fhandle_t *fhp;
-	int v3 = (nfsd->nd_flag & ND_NFSV3);
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-	if (!v3)
-		panic("nfsrv_pathconf: v3 proc called on a v2 connection");
-	fhp = &nfh.fh_generic;
-	nfsm_srvmtofh(fhp);
-	error = nfsrv_fhtovp(fhp, 0, &vp, nfsd, slp, nam, &rdonly);
-	if (error) {
-		nfsm_reply(NFSX_UNSIGNED);
-		nfsm_srvpostop_attr(getret, &at);
-		error = 0;
-		goto nfsmout;
-	}
-	error = VOP_PATHCONF(vp, _PC_LINK_MAX, &linkmax);
-	if (!error)
-		error = VOP_PATHCONF(vp, _PC_NAME_MAX, &namemax);
-	if (!error)
-		error = VOP_PATHCONF(vp, _PC_CHOWN_RESTRICTED, &chownres);
-	if (!error)
-		error = VOP_PATHCONF(vp, _PC_NO_TRUNC, &notrunc);
-	getret = VOP_GETATTR(vp, &at, cred);
-	vput(vp);
-	vp = NULL;
-	nfsm_reply(NFSX_V3POSTOPATTR + NFSX_V3PATHCONF);
-	nfsm_srvpostop_attr(getret, &at);
-	if (error) {
-		error = 0;
-		goto nfsmout;
-	}
-	pc = nfsm_build(struct nfsv3_pathconf *, NFSX_V3PATHCONF);
-
-	pc->pc_linkmax = txdr_unsigned(linkmax);
-	pc->pc_namemax = txdr_unsigned(namemax);
-	pc->pc_notrunc = txdr_unsigned(notrunc);
-	pc->pc_chownrestricted = txdr_unsigned(chownres);
-
-	/*
-	 * These should probably be supported by VOP_PATHCONF(), but
-	 * until msdosfs is exportable (why would you want to?), the
-	 * Unix defaults should be ok.
-	 */
-	pc->pc_caseinsensitive = nfsrv_nfs_false;
-	pc->pc_casepreserving = nfsrv_nfs_true;
-nfsmout:
-	if (vp)
-		vput(vp);
-	return(error);
-}
-
-/*
- * Null operation, used by clients to ping server
- */
-/* ARGSUSED */
-int
-nfsrv_null(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct mbuf **mrq)
-{
-	struct mbuf *mrep = nfsd->nd_mrep;
-	caddr_t bpos;
-	int error = NFSERR_RETVOID;
-	struct mbuf *mb, *mreq;
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-	nfsm_reply(0);
-nfsmout:
-	return (error);
-}
-
-/*
- * No operation, used for obsolete procedures
- */
-/* ARGSUSED */
-int
-nfsrv_noop(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct mbuf **mrq)
-{
-	struct mbuf *mrep = nfsd->nd_mrep;
-	caddr_t bpos;
-	int error;
-	struct mbuf *mb, *mreq;
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-	if (nfsd->nd_repstat)
-		error = nfsd->nd_repstat;
-	else
-		error = EPROCUNAVAIL;
-	nfsm_reply(0);
-	error = 0;
-nfsmout:
-	return (error);
-}
-
-/*
- * Perform access checking for vnodes obtained from file handles that would
- * refer to files already opened by a Unix client. You cannot just use
- * vn_writechk() and VOP_ACCESS() for two reasons.
- * 1 - You must check for exported rdonly as well as MNT_RDONLY for the write
- *     case.
- * 2 - The owner is to be given access irrespective of mode bits for some
- *     operations, so that processes that chmod after opening a file don't
- *     break. I don't like this because it opens a security hole, but since
- *     the nfs server opens a security hole the size of a barn door anyhow,
- *     what the heck.
- *
- * The exception to rule 2 is EPERM. If a file is IMMUTABLE, VOP_ACCESS()
- * will return EPERM instead of EACCES. EPERM is always an error.
- */
-static int
-nfsrv_access(struct vnode *vp, accmode_t accmode, struct ucred *cred,
-    int rdonly, int override)
-{
-	struct vattr vattr;
-	int error;
-
-	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
-
-	if (accmode & VWRITE) {
-		/* Just vn_writechk() changed to check rdonly */
-		/*
-		 * Disallow write attempts on read-only filesystems;
-		 * unless the file is a socket or a block or character
-		 * device resident on the filesystem.
-		 */
-		if (rdonly || (vp->v_mount->mnt_flag & MNT_RDONLY)) {
-			switch (vp->v_type) {
-			case VREG:
-			case VDIR:
-			case VLNK:
-				return (EROFS);
-			default:
-				break;
-			}
-		}
-		/*
-		 * If there's shared text associated with
-		 * the inode, we can't allow writing.
-		 */
-		if (VOP_IS_TEXT(vp))
-			return (ETXTBSY);
-	}
-
-	error = VOP_GETATTR(vp, &vattr, cred);
-	if (error)
-		return (error);
-	error = VOP_ACCESS(vp, accmode, cred, curthread);
-	/*
-	 * Allow certain operations for the owner (reads and writes
-	 * on files that are already open).
-	 */
-	if (override && error == EACCES && cred->cr_uid == vattr.va_uid)
-		error = 0;
-	return (error);
-}
diff --git a/sys/nfsserver/nfs_srvkrpc.c b/sys/nfsserver/nfs_srvkrpc.c
deleted file mode 100644
index 8bd045a..0000000
--- a/sys/nfsserver/nfs_srvkrpc.c
+++ /dev/null
@@ -1,545 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)nfs_syscalls.c	8.5 (Berkeley) 3/30/95
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "opt_inet6.h"
-#include "opt_kgssapi.h"
-
-#include <sys/param.h>
-#include <sys/capsicum.h>
-#include <sys/systm.h>
-#include <sys/sysproto.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/file.h>
-#include <sys/filedesc.h>
-#include <sys/jail.h>
-#include <sys/vnode.h>
-#include <sys/malloc.h>
-#include <sys/mount.h>
-#include <sys/priv.h>
-#include <sys/proc.h>
-#include <sys/bio.h>
-#include <sys/buf.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
-#include <sys/namei.h>
-#include <sys/fcntl.h>
-#include <sys/lockf.h>
-#include <sys/eventhandler.h>
-
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#ifdef INET6
-#include <net/if.h>
-#include <net/if_var.h>			/* XXX: for in6_var.h */
-#include <netinet6/in6_var.h>		/* XXX: for ip6_sprintf */
-#endif
-
-#include <rpc/rpc.h>
-#include <rpc/rpcsec_gss.h>
-#include <rpc/replay.h>
-
-#include <nfs/xdr_subs.h>
-#include <nfs/nfsproto.h>
-#include <nfs/nfs_fha.h>
-#include <nfsserver/nfs.h>
-#include <nfsserver/nfsm_subs.h>
-#include <nfsserver/nfsrvcache.h>
-#include <nfsserver/nfs_fha_old.h>
-
-#include <security/mac/mac_framework.h>
-
-static MALLOC_DEFINE(M_NFSSVC, "nfss_srvsock", "Nfs server structure");
-
-MALLOC_DEFINE(M_NFSRVDESC, "nfss_srvdesc", "NFS server socket descriptor");
-MALLOC_DEFINE(M_NFSD, "nfss_daemon", "Nfs server daemon structure");
-
-#define	TRUE	1
-#define	FALSE	0
-
-SYSCTL_DECL(_vfs_nfsrv);
-
-SVCPOOL		*nfsrv_pool;
-int		nfsd_waiting = 0;
-int		nfsrv_numnfsd = 0;
-struct callout	nfsrv_callout;
-static eventhandler_tag nfsrv_nmbclusters_tag;
-
-static int	nfs_privport = 0;
-SYSCTL_INT(_vfs_nfsrv, NFS_NFSPRIVPORT, nfs_privport, CTLFLAG_RW,
-    &nfs_privport, 0,
-    "Only allow clients using a privileged port");
-SYSCTL_INT(_vfs_nfsrv, OID_AUTO, gatherdelay, CTLFLAG_RW,
-    &nfsrvw_procrastinate, 0,
-    "Delay value for write gathering");
-SYSCTL_INT(_vfs_nfsrv, OID_AUTO, gatherdelay_v3, CTLFLAG_RW,
-    &nfsrvw_procrastinate_v3, 0,
-    "Delay in seconds for NFSv3 write gathering");
-
-static int	nfssvc_addsock(struct file *, struct thread *);
-static int	nfssvc_nfsd(struct thread *, struct nfsd_nfsd_args *);
-
-extern u_long sb_max_adj;
-
-int32_t (*nfsrv3_procs[NFS_NPROCS])(struct nfsrv_descript *nd,
-    struct nfssvc_sock *slp, struct mbuf **mreqp) = {
-	nfsrv_null,
-	nfsrv_getattr,
-	nfsrv_setattr,
-	nfsrv_lookup,
-	nfsrv3_access,
-	nfsrv_readlink,
-	nfsrv_read,
-	nfsrv_write,
-	nfsrv_create,
-	nfsrv_mkdir,
-	nfsrv_symlink,
-	nfsrv_mknod,
-	nfsrv_remove,
-	nfsrv_rmdir,
-	nfsrv_rename,
-	nfsrv_link,
-	nfsrv_readdir,
-	nfsrv_readdirplus,
-	nfsrv_statfs,
-	nfsrv_fsinfo,
-	nfsrv_pathconf,
-	nfsrv_commit,
-	nfsrv_noop
-};
-
-/*
- * NFS server system calls
- */
-/*
- * This is now called from nfssvc() in nfs/nfs_nfssvc.c.
- */
-
-/*
- * Nfs server psuedo system call for the nfsd's
- * Based on the flag value it either:
- * - adds a socket to the selection list
- * - remains in the kernel as an nfsd
- * - remains in the kernel as an nfsiod
- * For INET6 we suppose that nfsd provides only IN6P_IPV6_V6ONLY sockets
- * and that mountd provides
- *  - sockaddr with no IPv4-mapped addresses
- *  - mask for both INET and INET6 families if there is IPv4-mapped overlap
- */
-int
-nfssvc_nfsserver(struct thread *td, struct nfssvc_args *uap)
-{
-	struct file *fp;
-	struct nfsd_addsock_args addsockarg;
-	struct nfsd_nfsd_args nfsdarg;
-	cap_rights_t rights;
-	int error;
-
-	if (uap->flag & NFSSVC_ADDSOCK) {
-		error = copyin(uap->argp, (caddr_t)&addsockarg,
-		    sizeof(addsockarg));
-		if (error)
-			return (error);
-		error = fget(td, addsockarg.sock,
-		    cap_rights_init(&rights, CAP_SOCK_SERVER), &fp);
-		if (error)
-			return (error);
-		if (fp->f_type != DTYPE_SOCKET) {
-			fdrop(fp, td);
-			return (error);	/* XXXRW: Should be EINVAL? */
-		}
-		error = nfssvc_addsock(fp, td);
-		fdrop(fp, td);
-	} else if (uap->flag & NFSSVC_OLDNFSD)
-		error = nfssvc_nfsd(td, NULL);
-	else if (uap->flag & NFSSVC_NFSD) {
-		if (!uap->argp)
-			return (EINVAL);
-		error = copyin(uap->argp, (caddr_t)&nfsdarg,
-		    sizeof(nfsdarg));
-		if (error)
-			return (error);
-		error = nfssvc_nfsd(td, &nfsdarg);
-	} else
-		error = ENXIO;
-	return (error);
-}
-
-/*
- * Generate the rpc reply header
- * siz arg. is used to decide if adding a cluster is worthwhile
- */
-struct mbuf *
-nfs_rephead(int siz, struct nfsrv_descript *nd, int err,
-    struct mbuf **mbp, caddr_t *bposp)
-{
-	u_int32_t *tl;
-	struct mbuf *mreq;
-	caddr_t bpos;
-	struct mbuf *mb;
-
-	if (err == EBADRPC)
-		return (NULL);
-
-	nd->nd_repstat = err;
-	if (err && (nd->nd_flag & ND_NFSV3) == 0)	/* XXX recheck */
-		siz = 0;
-
-	MGET(mreq, M_WAITOK, MT_DATA);
-
-	/*
-	 * If this is a big reply, use a cluster
-	 */
-	mreq->m_len = 0;
-	if (siz >= MINCLSIZE) {
-		MCLGET(mreq, M_WAITOK);
-	}
-	mb = mreq;
-	bpos = mtod(mb, caddr_t);
-
-	if (err != NFSERR_RETVOID) {
-		tl = nfsm_build(u_int32_t *, NFSX_UNSIGNED);
-		if (err)
-			*tl = txdr_unsigned(nfsrv_errmap(nd, err));
-		else
-			*tl = 0;
-	}
-
-	*mbp = mb;
-	*bposp = bpos;
-	if (err != 0 && err != NFSERR_RETVOID)
-		nfsrvstats.srvrpc_errs++;
-
-	return (mreq);
-}
-
-static void
-nfssvc_program(struct svc_req *rqst, SVCXPRT *xprt)
-{
-	rpcproc_t procnum;
-	int32_t (*proc)(struct nfsrv_descript *nd, struct nfssvc_sock *slp,
-	    struct mbuf **mreqp);
-	int flag;
-	struct nfsrv_descript nd;
-	struct mbuf *mreq, *mrep;
-	int error;
-
-	if (rqst->rq_vers == NFS_VER2) {
-		if (rqst->rq_proc > NFSV2PROC_STATFS) {
-			svcerr_noproc(rqst);
-			svc_freereq(rqst);
-			return;
-		}
-		procnum = nfsrv_nfsv3_procid[rqst->rq_proc];
-		flag = 0;
-	} else {
-		if (rqst->rq_proc >= NFS_NPROCS) {
-			svcerr_noproc(rqst);
-			svc_freereq(rqst);
-			return;
-		}
-		procnum = rqst->rq_proc;
-		flag = ND_NFSV3;
-	}
-	proc = nfsrv3_procs[procnum];
-
-	mreq = mrep = NULL;
-	mreq = rqst->rq_args;
-	rqst->rq_args = NULL;
-	(void)nfs_realign(&mreq, M_WAITOK);
-
-	/*
-	 * Note: we want rq_addr, not svc_getrpccaller for nd_nam2 -
-	 * NFS_SRVMAXDATA uses a NULL value for nd_nam2 to detect TCP
-	 * mounts.
-	 */
-	memset(&nd, 0, sizeof(nd));
-	nd.nd_md = nd.nd_mrep = mreq;
-	nd.nd_dpos = mtod(mreq, caddr_t);
-	nd.nd_nam = svc_getrpccaller(rqst);
-	nd.nd_nam2 = rqst->rq_addr;
-	nd.nd_procnum = procnum;
-	nd.nd_cr = NULL;
-	nd.nd_flag = flag;
-
-	if (nfs_privport) {
-		/* Check if source port is privileged */
-		u_short port;
-		struct sockaddr *nam = nd.nd_nam;
-		struct sockaddr_in *sin;
-
-		sin = (struct sockaddr_in *)nam;
-		/*
-		 * INET/INET6 - same code:
-		 *    sin_port and sin6_port are at same offset
-		 */
-		port = ntohs(sin->sin_port);
-		if (port >= IPPORT_RESERVED &&
-		    nd.nd_procnum != NFSPROC_NULL) {
-#ifdef INET6
-			char b6[INET6_ADDRSTRLEN];
-#if defined(KLD_MODULE)
-			/* Do not use ip6_sprintf: the nfs module should work without INET6. */
-#define ip6_sprintf(buf, a)						\
-			(sprintf((buf), "%x:%x:%x:%x:%x:%x:%x:%x",	\
-			    (a)->s6_addr16[0], (a)->s6_addr16[1],	\
-			    (a)->s6_addr16[2], (a)->s6_addr16[3],	\
-			    (a)->s6_addr16[4], (a)->s6_addr16[5],	\
-			    (a)->s6_addr16[6], (a)->s6_addr16[7]),	\
-			    (buf))
-#endif
-#endif
-			printf("NFS request from unprivileged port (%s:%d)\n",
-#ifdef INET6
-			    sin->sin_family == AF_INET6 ?
-			    ip6_sprintf(b6, &satosin6(sin)->sin6_addr) :
-#if defined(KLD_MODULE)
-#undef ip6_sprintf
-#endif
-#endif
-			    inet_ntoa(sin->sin_addr), port);
-			m_freem(mreq);
-			svcerr_weakauth(rqst);
-			svc_freereq(rqst);
-			return;
-		}
-	}
-
-	if (proc != nfsrv_null) {
-		if (!svc_getcred(rqst, &nd.nd_cr, &nd.nd_credflavor)) {
-			m_freem(mreq);
-			svcerr_weakauth(rqst);
-			svc_freereq(rqst);
-			return;
-		}
-#ifdef MAC
-		mac_cred_associate_nfsd(nd.nd_cr);
-#endif
-	}
-	nfsrvstats.srvrpccnt[nd.nd_procnum]++;
-
-	error = proc(&nd, NULL, &mrep);
-
-	if (nd.nd_cr)
-		crfree(nd.nd_cr);
-
-	if (mrep == NULL) {
-		svcerr_decode(rqst);
-		svc_freereq(rqst);
-		return;
-	}
-	if (error && error != NFSERR_RETVOID) {
-		svcerr_systemerr(rqst);
-		svc_freereq(rqst);
-		return;
-	}
-	if (nd.nd_repstat & NFSERR_AUTHERR) {
-		svcerr_auth(rqst, nd.nd_repstat & ~NFSERR_AUTHERR);
-		m_freem(mrep);
-	} else {
-		if (!svc_sendreply_mbuf(rqst, mrep))
-			svcerr_systemerr(rqst);
-	}
-	svc_freereq(rqst);
-}
-
-/*
- * Adds a socket to the list for servicing by nfsds.
- */
-static int
-nfssvc_addsock(struct file *fp, struct thread *td)
-{
-	int siz;
-	struct socket *so;
-	int error;
-	SVCXPRT *xprt;
-
-	so = fp->f_data;
-
-	siz = sb_max_adj;
-	error = soreserve(so, siz, siz);
-	if (error)
-		return (error);
-
-	/*
-	 * Steal the socket from userland so that it doesn't close
-	 * unexpectedly.
-	 */
-	if (so->so_type == SOCK_DGRAM)
-		xprt = svc_dg_create(nfsrv_pool, so, 0, 0);
-	else
-		xprt = svc_vc_create(nfsrv_pool, so, 0, 0);
-	if (xprt) {
-		fp->f_ops = &badfileops;
-		fp->f_data = NULL;
-		svc_reg(xprt, NFS_PROG, NFS_VER2, nfssvc_program, NULL);
-		svc_reg(xprt, NFS_PROG, NFS_VER3, nfssvc_program, NULL);
-		SVC_RELEASE(xprt);
-	}
-
-	return (0);
-}
-
-/*
- * Called by nfssvc() for nfsds.  Just loops around servicing rpc requests
- * until it is killed by a signal.
- */
-static int
-nfssvc_nfsd(struct thread *td, struct nfsd_nfsd_args *args)
-{
-	char principal[128];
-	int error;
-
-	if (args) {
-		error = copyinstr(args->principal, principal,
-		    sizeof(principal), NULL);
-		if (error)
-			return (error);
-	} else {
-		memcpy(principal, "nfs@", 4);
-		getcredhostname(td->td_ucred, principal + 4,
-		    sizeof(principal) - 4);
-	}
-
-	/*
-	 * Only the first nfsd actually does any work.  The RPC code
-	 * adds threads to it as needed.  Any extra processes offered
-	 * by nfsd just exit.  If nfsd is new enough, it will call us
-	 * once with a structure that specifies how many threads to
-	 * use.
-	 */
-	NFSD_LOCK();
-	if (nfsrv_numnfsd == 0) {
-		nfsrv_numnfsd++;
-
-		NFSD_UNLOCK();
-
-		rpc_gss_set_svc_name_call(principal, "kerberosv5",
-		    GSS_C_INDEFINITE, NFS_PROG, NFS_VER2);
-		rpc_gss_set_svc_name_call(principal, "kerberosv5",
-		    GSS_C_INDEFINITE, NFS_PROG, NFS_VER3);
-
-		if (args) {
-			nfsrv_pool->sp_minthreads = args->minthreads;
-			nfsrv_pool->sp_maxthreads = args->maxthreads;
-		} else {
-			nfsrv_pool->sp_minthreads = 4;
-			nfsrv_pool->sp_maxthreads = 4;
-		}
-
-		svc_run(nfsrv_pool);
-
-		rpc_gss_clear_svc_name_call(NFS_PROG, NFS_VER2);
-		rpc_gss_clear_svc_name_call(NFS_PROG, NFS_VER3);
-
-		NFSD_LOCK();
-		nfsrv_numnfsd--;
-		nfsrv_init(TRUE);
-	}
-	NFSD_UNLOCK();
-
-	return (0);
-}
-
-/*
- * Size the NFS server's duplicate request cache at 1/2 the
- * nmbclusters, floating within a (64, 2048) range.  This is to
- * prevent all mbuf clusters being tied up in the NFS dupreq
- * cache for small values of nmbclusters.
- */
-static size_t
-nfsrv_replay_size(void)
-{
-	size_t replaysiz;
-
-	replaysiz = nmbclusters / 2;
-	if (replaysiz > NFSRVCACHE_MAX_SIZE)
-		replaysiz = NFSRVCACHE_MAX_SIZE;
-	if (replaysiz < NFSRVCACHE_MIN_SIZE)
-		replaysiz = NFSRVCACHE_MIN_SIZE;
-	replaysiz *= MCLBYTES;
-
-	return (replaysiz);
-}
-
-/*
- * Called when nmbclusters changes - we resize the replay cache
- * accordingly.
- */
-static void
-nfsrv_nmbclusters_change(void *tag)
-{
-
-	if (nfsrv_pool)
-		replay_setsize(nfsrv_pool->sp_rcache, nfsrv_replay_size());
-}
-
-/*
- * Initialize the data structures for the server.
- * Handshake with any new nfsds starting up to avoid any chance of
- * corruption.
- */
-void
-nfsrv_init(int terminating)
-{
-
-	NFSD_LOCK_ASSERT();
-
-	if (terminating) {
-		NFSD_UNLOCK();
-		EVENTHANDLER_DEREGISTER(nmbclusters_change,
-		    nfsrv_nmbclusters_tag);
-		svcpool_destroy(nfsrv_pool);
-		nfsrv_pool = NULL;
-		NFSD_LOCK();
-	} else
-		nfs_pub.np_valid = 0;
-
-	NFSD_UNLOCK();
-
-	nfsrv_pool = svcpool_create("nfsd", SYSCTL_STATIC_CHILDREN(_vfs_nfsrv));
-	nfsrv_pool->sp_rcache = replay_newcache(nfsrv_replay_size());
-	nfsrv_pool->sp_assign = fhaold_assign;
-	nfsrv_pool->sp_done = fha_nd_complete;
-	nfsrv_nmbclusters_tag = EVENTHANDLER_REGISTER(nmbclusters_change,
-	    nfsrv_nmbclusters_change, NULL, EVENTHANDLER_PRI_FIRST);
-
-	NFSD_LOCK();
-}
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
deleted file mode 100644
index 04371da..0000000
--- a/sys/nfsserver/nfs_srvsubs.c
+++ /dev/null
@@ -1,1418 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-/*
- * These functions support the macros and help fiddle mbuf chains for
- * the nfs op functions. They do things like create the rpc header and
- * copy data between mbuf chains and uio lists.
- */
-
-#include "opt_inet6.h"
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/bio.h>
-#include <sys/buf.h>
-#include <sys/proc.h>
-#include <sys/mount.h>
-#include <sys/vnode.h>
-#include <sys/namei.h>
-#include <sys/mbuf.h>
-#include <sys/refcount.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/malloc.h>
-#include <sys/module.h>
-#include <sys/sysent.h>
-#include <sys/syscall.h>
-#include <sys/sysproto.h>
-
-#include <vm/vm.h>
-#include <vm/vm_object.h>
-#include <vm/vm_extern.h>
-#include <vm/uma.h>
-
-#include <rpc/rpc.h>
-
-#include <nfs/nfsproto.h>
-#include <nfsserver/nfs.h>
-#include <nfs/xdr_subs.h>
-#include <nfsserver/nfsm_subs.h>
-
-#include <netinet/in.h>
-
-/*
- * Data items converted to xdr at startup, since they are constant
- * This is kinda hokey, but may save a little time doing byte swaps
- */
-u_int32_t nfsrv_nfs_xdrneg1;
-u_int32_t nfsrv_nfs_true, nfsrv_nfs_false;
-
-/* And other global data */
-static const nfstype nfsv2_type[9] = { NFNON, NFREG, NFDIR, NFBLK, NFCHR,
-				       NFLNK, NFNON, NFCHR, NFNON };
-#define vtonfsv2_type(a)	txdr_unsigned(nfsv2_type[((int32_t)(a))])
-#define vtonfsv3_mode(m)	txdr_unsigned((m) & ALLPERMS)
-
-int nfsrv_ticks;
-
-struct mtx nfsd_mtx;
-
-/*
- * Mapping of old NFS Version 2 RPC numbers to generic numbers.
- */
-const int nfsrv_nfsv3_procid[NFS_NPROCS] = {
-	NFSPROC_NULL,
-	NFSPROC_GETATTR,
-	NFSPROC_SETATTR,
-	NFSPROC_NOOP,
-	NFSPROC_LOOKUP,
-	NFSPROC_READLINK,
-	NFSPROC_READ,
-	NFSPROC_NOOP,
-	NFSPROC_WRITE,
-	NFSPROC_CREATE,
-	NFSPROC_REMOVE,
-	NFSPROC_RENAME,
-	NFSPROC_LINK,
-	NFSPROC_SYMLINK,
-	NFSPROC_MKDIR,
-	NFSPROC_RMDIR,
-	NFSPROC_READDIR,
-	NFSPROC_FSSTAT,
-	NFSPROC_NOOP,
-	NFSPROC_NOOP,
-	NFSPROC_NOOP,
-	NFSPROC_NOOP,
-	NFSPROC_NOOP,
-};
-
-/*
- * and the reverse mapping from generic to Version 2 procedure numbers
- */
-const int nfsrvv2_procid[NFS_NPROCS] = {
-	NFSV2PROC_NULL,
-	NFSV2PROC_GETATTR,
-	NFSV2PROC_SETATTR,
-	NFSV2PROC_LOOKUP,
-	NFSV2PROC_NOOP,
-	NFSV2PROC_READLINK,
-	NFSV2PROC_READ,
-	NFSV2PROC_WRITE,
-	NFSV2PROC_CREATE,
-	NFSV2PROC_MKDIR,
-	NFSV2PROC_SYMLINK,
-	NFSV2PROC_CREATE,
-	NFSV2PROC_REMOVE,
-	NFSV2PROC_RMDIR,
-	NFSV2PROC_RENAME,
-	NFSV2PROC_LINK,
-	NFSV2PROC_READDIR,
-	NFSV2PROC_NOOP,
-	NFSV2PROC_STATFS,
-	NFSV2PROC_NOOP,
-	NFSV2PROC_NOOP,
-	NFSV2PROC_NOOP,
-	NFSV2PROC_NOOP,
-};
-
-/*
- * Maps errno values to nfs error numbers.
- * Use 0 (which gets converted to NFSERR_IO) as the catch all for ones not
- * specifically defined in RFC 1094.
- */
-static const u_char nfsrv_v2errmap[ELAST] = {
-  NFSERR_PERM,	NFSERR_NOENT,	0,		0,		0,	
-  NFSERR_NXIO,	0,		0,		0,		0,	
-  0,		0,		NFSERR_ACCES,	0,		0,	
-  0,		NFSERR_EXIST,	0,		NFSERR_NODEV,	NFSERR_NOTDIR,
-  NFSERR_ISDIR,	0,		0,		0,		0,	
-  0,		NFSERR_FBIG,	NFSERR_NOSPC,	0,		NFSERR_ROFS,
-  0,		0,		0,		0,		0,	
-  0,		0,		0,		0,		0,	
-  0,		0,		0,		0,		0,	
-  0,		0,		0,		0,		0,	
-  0,		0,		0,		0,		0,	
-  0,		0,		0,		0,		0,	
-  0,		0,		NFSERR_NAMETOL,	0,		0,	
-  NFSERR_NOTEMPTY, 0,		0,		NFSERR_DQUOT,	NFSERR_STALE,
-  0
-};
-
-/*
- * Maps errno values to nfs error numbers.
- * Although it is not obvious whether or not NFS clients really care if
- * a returned error value is in the specified list for the procedure, the
- * safest thing to do is filter them appropriately. For Version 2, the
- * X/Open XNFS document is the only specification that defines error values
- * for each RPC (The RFC simply lists all possible error values for all RPCs),
- * so I have decided to not do this for Version 2.
- * The first entry is the default error return and the rest are the valid
- * errors for that RPC in increasing numeric order.
- */
-static const short nfsv3err_null[] = {
-	0,
-	0,
-};
-
-static const short nfsv3err_getattr[] = {
-	NFSERR_IO,
-	NFSERR_IO,
-	NFSERR_STALE,
-	NFSERR_BADHANDLE,
-	NFSERR_SERVERFAULT,
-	0,
-};
-
-static const short nfsv3err_setattr[] = {
-	NFSERR_IO,
-	NFSERR_PERM,
-	NFSERR_IO,
-	NFSERR_ACCES,
-	NFSERR_INVAL,
-	NFSERR_NOSPC,
-	NFSERR_ROFS,
-	NFSERR_DQUOT,
-	NFSERR_STALE,
-	NFSERR_BADHANDLE,
-	NFSERR_NOT_SYNC,
-	NFSERR_SERVERFAULT,
-	0,
-};
-
-static const short nfsv3err_lookup[] = {
-	NFSERR_IO,
-	NFSERR_NOENT,
-	NFSERR_IO,
-	NFSERR_ACCES,
-	NFSERR_NOTDIR,
-	NFSERR_NAMETOL,
-	NFSERR_STALE,
-	NFSERR_BADHANDLE,
-	NFSERR_SERVERFAULT,
-	0,
-};
-
-static const short nfsv3err_access[] = {
-	NFSERR_IO,
-	NFSERR_IO,
-	NFSERR_STALE,
-	NFSERR_BADHANDLE,
-	NFSERR_SERVERFAULT,
-	0,
-};
-
-static const short nfsv3err_readlink[] = {
-	NFSERR_IO,
-	NFSERR_IO,
-	NFSERR_ACCES,
-	NFSERR_INVAL,
-	NFSERR_STALE,
-	NFSERR_BADHANDLE,
-	NFSERR_NOTSUPP,
-	NFSERR_SERVERFAULT,
-	0,
-};
-
-static const short nfsv3err_read[] = {
-	NFSERR_IO,
-	NFSERR_IO,
-	NFSERR_NXIO,
-	NFSERR_ACCES,
-	NFSERR_INVAL,
-	NFSERR_STALE,
-	NFSERR_BADHANDLE,
-	NFSERR_SERVERFAULT,
-	0,
-};
-
-static const short nfsv3err_write[] = {
-	NFSERR_IO,
-	NFSERR_IO,
-	NFSERR_ACCES,
-	NFSERR_INVAL,
-	NFSERR_FBIG,
-	NFSERR_NOSPC,
-	NFSERR_ROFS,
-	NFSERR_DQUOT,
-	NFSERR_STALE,
-	NFSERR_BADHANDLE,
-	NFSERR_SERVERFAULT,
-	0,
-};
-
-static const short nfsv3err_create[] = {
-	NFSERR_IO,
-	NFSERR_IO,
-	NFSERR_ACCES,
-	NFSERR_EXIST,
-	NFSERR_NOTDIR,
-	NFSERR_NOSPC,
-	NFSERR_ROFS,
-	NFSERR_NAMETOL,
-	NFSERR_DQUOT,
-	NFSERR_STALE,
-	NFSERR_BADHANDLE,
-	NFSERR_NOTSUPP,
-	NFSERR_SERVERFAULT,
-	0,
-};
-
-static const short nfsv3err_mkdir[] = {
-	NFSERR_IO,
-	NFSERR_IO,
-	NFSERR_ACCES,
-	NFSERR_EXIST,
-	NFSERR_NOTDIR,
-	NFSERR_NOSPC,
-	NFSERR_ROFS,
-	NFSERR_NAMETOL,
-	NFSERR_DQUOT,
-	NFSERR_STALE,
-	NFSERR_BADHANDLE,
-	NFSERR_NOTSUPP,
-	NFSERR_SERVERFAULT,
-	0,
-};
-
-static const short nfsv3err_symlink[] = {
-	NFSERR_IO,
-	NFSERR_IO,
-	NFSERR_ACCES,
-	NFSERR_EXIST,
-	NFSERR_NOTDIR,
-	NFSERR_NOSPC,
-	NFSERR_ROFS,
-	NFSERR_NAMETOL,
-	NFSERR_DQUOT,
-	NFSERR_STALE,
-	NFSERR_BADHANDLE,
-	NFSERR_NOTSUPP,
-	NFSERR_SERVERFAULT,
-	0,
-};
-
-static const short nfsv3err_mknod[] = {
-	NFSERR_IO,
-	NFSERR_IO,
-	NFSERR_ACCES,
-	NFSERR_EXIST,
-	NFSERR_NOTDIR,
-	NFSERR_NOSPC,
-	NFSERR_ROFS,
-	NFSERR_NAMETOL,
-	NFSERR_DQUOT,
-	NFSERR_STALE,
-	NFSERR_BADHANDLE,
-	NFSERR_NOTSUPP,
-	NFSERR_SERVERFAULT,
-	NFSERR_BADTYPE,
-	0,
-};
-
-static const short nfsv3err_remove[] = {
-	NFSERR_IO,
-	NFSERR_NOENT,
-	NFSERR_IO,
-	NFSERR_ACCES,
-	NFSERR_NOTDIR,
-	NFSERR_ROFS,
-	NFSERR_NAMETOL,
-	NFSERR_STALE,
-	NFSERR_BADHANDLE,
-	NFSERR_SERVERFAULT,
-	0,
-};
-
-static const short nfsv3err_rmdir[] = {
-	NFSERR_IO,
-	NFSERR_NOENT,
-	NFSERR_IO,
-	NFSERR_ACCES,
-	NFSERR_EXIST,
-	NFSERR_NOTDIR,
-	NFSERR_INVAL,
-	NFSERR_ROFS,
-	NFSERR_NAMETOL,
-	NFSERR_NOTEMPTY,
-	NFSERR_STALE,
-	NFSERR_BADHANDLE,
-	NFSERR_NOTSUPP,
-	NFSERR_SERVERFAULT,
-	0,
-};
-
-static const short nfsv3err_rename[] = {
-	NFSERR_IO,
-	NFSERR_NOENT,
-	NFSERR_IO,
-	NFSERR_ACCES,
-	NFSERR_EXIST,
-	NFSERR_XDEV,
-	NFSERR_NOTDIR,
-	NFSERR_ISDIR,
-	NFSERR_INVAL,
-	NFSERR_NOSPC,
-	NFSERR_ROFS,
-	NFSERR_MLINK,
-	NFSERR_NAMETOL,
-	NFSERR_NOTEMPTY,
-	NFSERR_DQUOT,
-	NFSERR_STALE,
-	NFSERR_BADHANDLE,
-	NFSERR_NOTSUPP,
-	NFSERR_SERVERFAULT,
-	0,
-};
-
-static const short nfsv3err_link[] = {
-	NFSERR_IO,
-	NFSERR_IO,
-	NFSERR_ACCES,
-	NFSERR_EXIST,
-	NFSERR_XDEV,
-	NFSERR_NOTDIR,
-	NFSERR_INVAL,
-	NFSERR_NOSPC,
-	NFSERR_ROFS,
-	NFSERR_MLINK,
-	NFSERR_NAMETOL,
-	NFSERR_DQUOT,
-	NFSERR_STALE,
-	NFSERR_BADHANDLE,
-	NFSERR_NOTSUPP,
-	NFSERR_SERVERFAULT,
-	0,
-};
-
-static const short nfsv3err_readdir[] = {
-	NFSERR_IO,
-	NFSERR_IO,
-	NFSERR_ACCES,
-	NFSERR_NOTDIR,
-	NFSERR_STALE,
-	NFSERR_BADHANDLE,
-	NFSERR_BAD_COOKIE,
-	NFSERR_TOOSMALL,
-	NFSERR_SERVERFAULT,
-	0,
-};
-
-static const short nfsv3err_readdirplus[] = {
-	NFSERR_IO,
-	NFSERR_IO,
-	NFSERR_ACCES,
-	NFSERR_NOTDIR,
-	NFSERR_STALE,
-	NFSERR_BADHANDLE,
-	NFSERR_BAD_COOKIE,
-	NFSERR_NOTSUPP,
-	NFSERR_TOOSMALL,
-	NFSERR_SERVERFAULT,
-	0,
-};
-
-static const short nfsv3err_fsstat[] = {
-	NFSERR_IO,
-	NFSERR_IO,
-	NFSERR_STALE,
-	NFSERR_BADHANDLE,
-	NFSERR_SERVERFAULT,
-	0,
-};
-
-static const short nfsv3err_fsinfo[] = {
-	NFSERR_STALE,
-	NFSERR_STALE,
-	NFSERR_BADHANDLE,
-	NFSERR_SERVERFAULT,
-	0,
-};
-
-static const short nfsv3err_pathconf[] = {
-	NFSERR_STALE,
-	NFSERR_STALE,
-	NFSERR_BADHANDLE,
-	NFSERR_SERVERFAULT,
-	0,
-};
-
-static const short nfsv3err_commit[] = {
-	NFSERR_IO,
-	NFSERR_IO,
-	NFSERR_STALE,
-	NFSERR_BADHANDLE,
-	NFSERR_SERVERFAULT,
-	0,
-};
-
-static const short *nfsrv_v3errmap[] = {
-	nfsv3err_null,
-	nfsv3err_getattr,
-	nfsv3err_setattr,
-	nfsv3err_lookup,
-	nfsv3err_access,
-	nfsv3err_readlink,
-	nfsv3err_read,
-	nfsv3err_write,
-	nfsv3err_create,
-	nfsv3err_mkdir,
-	nfsv3err_symlink,
-	nfsv3err_mknod,
-	nfsv3err_remove,
-	nfsv3err_rmdir,
-	nfsv3err_rename,
-	nfsv3err_link,
-	nfsv3err_readdir,
-	nfsv3err_readdirplus,
-	nfsv3err_fsstat,
-	nfsv3err_fsinfo,
-	nfsv3err_pathconf,
-	nfsv3err_commit,
-};
-
-extern int (*nfsd_call_nfsserver)(struct thread *, struct nfssvc_args *);
-
-/*
- * Called once to initialize data structures...
- */
-static int
-nfsrv_modevent(module_t mod, int type, void *data)
-{
-	int error = 0;
-
-	switch (type) {
-	case MOD_LOAD:
-		mtx_init(&nfsd_mtx, "nfsd_mtx", NULL, MTX_DEF);
-		nfsrv_nfs_true = txdr_unsigned(TRUE);
-		nfsrv_nfs_false = txdr_unsigned(FALSE);
-		nfsrv_nfs_xdrneg1 = txdr_unsigned(-1);
-		nfsrv_ticks = (hz * NFS_TICKINTVL + 500) / 1000;
-		if (nfsrv_ticks < 1)
-			nfsrv_ticks = 1;
-
-		NFSD_LOCK();
-		nfsrv_init(0);		/* Init server data structures */
-		NFSD_UNLOCK();
-
-		nfsd_call_nfsserver = nfssvc_nfsserver;
-		break;
-
-	case MOD_UNLOAD:
-		if (nfsrv_numnfsd != 0) {
-			error = EBUSY;
-			break;
-		}
-
-		nfsd_call_nfsserver = NULL;
-		callout_drain(&nfsrv_callout);
-		mtx_destroy(&nfsd_mtx);
-		break;
-	default:
-		error = EOPNOTSUPP;
-		break;
-	}
-	return error;
-}
-static moduledata_t nfsserver_mod = {
-	"nfsserver",
-	nfsrv_modevent,
-	NULL,
-};
-DECLARE_MODULE(nfsserver, nfsserver_mod, SI_SUB_VFS, SI_ORDER_ANY);
-
-/* So that loader and kldload(2) can find us, wherever we are.. */
-MODULE_VERSION(nfsserver, 1);
-MODULE_DEPEND(nfsserver, nfssvc, 1, 1, 1);
-MODULE_DEPEND(nfsserver, krpc, 1, 1, 1);
-MODULE_DEPEND(nfsserver, nfs_common, 1, 1, 1);
-
-/*
- * Set up nameidata for a lookup() call and do it.
- *
- * If pubflag is set, this call is done for a lookup operation on the
- * public filehandle. In that case we allow crossing mountpoints and
- * absolute pathnames. However, the caller is expected to check that
- * the lookup result is within the public fs, and deny access if
- * it is not.
- *
- * nfs_namei() clears out garbage fields that namei() might leave garbage.
- * This is mainly ni_vp and ni_dvp when an error occurs, and ni_dvp when no
- * error occurs but the parent was not requested.
- *
- * dirp may be set whether an error is returned or not, and must be
- * released by the caller.
- */
-int
-nfs_namei(struct nameidata *ndp, struct nfsrv_descript *nfsd,
-    fhandle_t *fhp, int len, struct nfssvc_sock *slp,
-    struct sockaddr *nam, struct mbuf **mdp,
-    caddr_t *dposp, struct vnode **retdirp, int v3, struct vattr *retdirattrp,
-    int *retdirattr_retp, int pubflag)
-{
-	int i, rem;
-	struct mbuf *md;
-	char *fromcp, *tocp, *cp;
-	struct iovec aiov;
-	struct uio auio;
-	struct vnode *dp;
-	int error, rdonly, linklen;
-	struct componentname *cnp = &ndp->ni_cnd;
-	int lockleaf = (cnp->cn_flags & LOCKLEAF) != 0;
-
-	*retdirp = NULL;
-	cnp->cn_flags |= NOMACCHECK;
-	cnp->cn_pnbuf = uma_zalloc(namei_zone, M_WAITOK);
-
-	/*
-	 * Copy the name from the mbuf list to ndp->ni_pnbuf
-	 * and set the various ndp fields appropriately.
-	 */
-	fromcp = *dposp;
-	tocp = cnp->cn_pnbuf;
-	md = *mdp;
-	rem = mtod(md, caddr_t) + md->m_len - fromcp;
-	for (i = 0; i < len; i++) {
-		while (rem == 0) {
-			md = md->m_next;
-			if (md == NULL) {
-				error = EBADRPC;
-				goto out;
-			}
-			fromcp = mtod(md, caddr_t);
-			rem = md->m_len;
-		}
-		if (*fromcp == '\0' || (!pubflag && *fromcp == '/')) {
-			error = EACCES;
-			goto out;
-		}
-		*tocp++ = *fromcp++;
-		rem--;
-	}
-	*tocp = '\0';
-	*mdp = md;
-	*dposp = fromcp;
-	len = nfsm_rndup(len)-len;
-	if (len > 0) {
-		if (rem >= len)
-			*dposp += len;
-		else if ((error = nfs_adv(mdp, dposp, len, rem)) != 0)
-			goto out;
-	}
-
-	if (!pubflag && nfs_ispublicfh(fhp))
-		return (ESTALE);
-
-	/*
-	 * Extract and set starting directory.
-	 */
-	error = nfsrv_fhtovp(fhp, 0, &dp, nfsd, slp, nam, &rdonly);
-	if (error)
-		goto out;
-	if (dp->v_type != VDIR) {
-		vput(dp);
-		error = ENOTDIR;
-		goto out;
-	}
-
-	if (rdonly)
-		cnp->cn_flags |= RDONLY;
-
-	/*
-	 * Set return directory.  Reference to dp is implicitly transfered
-	 * to the returned pointer
-	 */
-	*retdirp = dp;
-	if (v3) {
-		*retdirattr_retp = VOP_GETATTR(dp, retdirattrp,
-			ndp->ni_cnd.cn_cred);
-	}
-
-	VOP_UNLOCK(dp, 0);
-
-	if (pubflag) {
-		/*
-		 * Oh joy. For WebNFS, handle those pesky '%' escapes,
-		 * and the 'native path' indicator.
-		 */
-		cp = uma_zalloc(namei_zone, M_WAITOK);
-		fromcp = cnp->cn_pnbuf;
-		tocp = cp;
-		if ((unsigned char)*fromcp >= WEBNFS_SPECCHAR_START) {
-			switch ((unsigned char)*fromcp) {
-			case WEBNFS_NATIVE_CHAR:
-				/*
-				 * 'Native' path for us is the same
-				 * as a path according to the NFS spec,
-				 * just skip the escape char.
-				 */
-				fromcp++;
-				break;
-			/*
-			 * More may be added in the future, range 0x80-0xff
-			 */
-			default:
-				error = EIO;
-				uma_zfree(namei_zone, cp);
-				goto out;
-			}
-		}
-		/*
-		 * Translate the '%' escapes, URL-style.
-		 */
-		while (*fromcp != '\0') {
-			if (*fromcp == WEBNFS_ESC_CHAR) {
-				if (fromcp[1] != '\0' && fromcp[2] != '\0') {
-					fromcp++;
-					*tocp++ = HEXSTRTOI(fromcp);
-					fromcp += 2;
-					continue;
-				} else {
-					error = ENOENT;
-					uma_zfree(namei_zone, cp);
-					goto out;
-				}
-			} else
-				*tocp++ = *fromcp++;
-		}
-		*tocp = '\0';
-		uma_zfree(namei_zone, cnp->cn_pnbuf);
-		cnp->cn_pnbuf = cp;
-	}
-
-	ndp->ni_pathlen = (tocp - cnp->cn_pnbuf) + 1;
-	ndp->ni_segflg = UIO_SYSSPACE;
-
-	if (pubflag) {
-		ndp->ni_rootdir = rootvnode;
-		ndp->ni_loopcnt = 0;
-
-		if (cnp->cn_pnbuf[0] == '/')
-			dp = rootvnode;
-	} else {
-		cnp->cn_flags |= NOCROSSMOUNT;
-	}
-
-	/*
-	 * Initialize for scan, set ni_startdir and bump ref on dp again
-	 * because lookup() will dereference ni_startdir.
-	 */
-
-	cnp->cn_thread = curthread;
-	VREF(dp);
-	ndp->ni_startdir = dp;
-
-	if (!lockleaf)
-		cnp->cn_flags |= LOCKLEAF;
-	for (;;) {
-		cnp->cn_nameptr = cnp->cn_pnbuf;
-		/*
-		 * Call lookup() to do the real work.  If an error occurs,
-		 * ndp->ni_vp and ni_dvp are left uninitialized or NULL and
-		 * we do not have to dereference anything before returning.
-		 * In either case ni_startdir will be dereferenced and NULLed
-		 * out.
-		 */
-		error = lookup(ndp);
-		if (error)
-			break;
-
-		/*
-		 * Check for encountering a symbolic link.  Trivial
-		 * termination occurs if no symlink encountered.
-		 * Note: zfree is safe because error is 0, so we will
-		 * not zfree it again when we break.
-		 */
-		if ((cnp->cn_flags & ISSYMLINK) == 0) {
-			if (cnp->cn_flags & (SAVENAME | SAVESTART))
-				cnp->cn_flags |= HASBUF;
-			else
-				uma_zfree(namei_zone, cnp->cn_pnbuf);
-			if (ndp->ni_vp && !lockleaf)
-				VOP_UNLOCK(ndp->ni_vp, 0);
-			break;
-		}
-
-		/*
-		 * Validate symlink
-		 */
-		if ((cnp->cn_flags & LOCKPARENT) && ndp->ni_pathlen == 1)
-			VOP_UNLOCK(ndp->ni_dvp, 0);
-		if (!pubflag) {
-			error = EINVAL;
-			goto badlink2;
-		}
-
-		if (ndp->ni_loopcnt++ >= MAXSYMLINKS) {
-			error = ELOOP;
-			goto badlink2;
-		}
-		if (ndp->ni_pathlen > 1)
-			cp = uma_zalloc(namei_zone, M_WAITOK);
-		else
-			cp = cnp->cn_pnbuf;
-		aiov.iov_base = cp;
-		aiov.iov_len = MAXPATHLEN;
-		auio.uio_iov = &aiov;
-		auio.uio_iovcnt = 1;
-		auio.uio_offset = 0;
-		auio.uio_rw = UIO_READ;
-		auio.uio_segflg = UIO_SYSSPACE;
-		auio.uio_td = NULL;
-		auio.uio_resid = MAXPATHLEN;
-		error = VOP_READLINK(ndp->ni_vp, &auio, cnp->cn_cred);
-		if (error) {
-		badlink1:
-			if (ndp->ni_pathlen > 1)
-				uma_zfree(namei_zone, cp);
-		badlink2:
-			vput(ndp->ni_vp);
-			vrele(ndp->ni_dvp);
-			break;
-		}
-		linklen = MAXPATHLEN - auio.uio_resid;
-		if (linklen == 0) {
-			error = ENOENT;
-			goto badlink1;
-		}
-		if (linklen + ndp->ni_pathlen >= MAXPATHLEN) {
-			error = ENAMETOOLONG;
-			goto badlink1;
-		}
-
-		/*
-		 * Adjust or replace path
-		 */
-		if (ndp->ni_pathlen > 1) {
-			bcopy(ndp->ni_next, cp + linklen, ndp->ni_pathlen);
-			uma_zfree(namei_zone, cnp->cn_pnbuf);
-			cnp->cn_pnbuf = cp;
-		} else
-			cnp->cn_pnbuf[linklen] = '\0';
-		ndp->ni_pathlen += linklen;
-
-		/*
-		 * Cleanup refs for next loop and check if root directory
-		 * should replace current directory.  Normally ni_dvp
-		 * becomes the new base directory and is cleaned up when
-		 * we loop.  Explicitly null pointers after invalidation
-		 * to clarify operation.
-		 */
-		vput(ndp->ni_vp);
-		ndp->ni_vp = NULL;
-
-		if (cnp->cn_pnbuf[0] == '/') {
-			vrele(ndp->ni_dvp);
-			ndp->ni_dvp = ndp->ni_rootdir;
-			VREF(ndp->ni_dvp);
-		}
-		ndp->ni_startdir = ndp->ni_dvp;
-		ndp->ni_dvp = NULL;
-	}
-	if (!lockleaf)
-		cnp->cn_flags &= ~LOCKLEAF;
-
-	/*
-	 * nfs_namei() guarentees that fields will not contain garbage
-	 * whether an error occurs or not.  This allows the caller to track
-	 * cleanup state trivially.
-	 */
-out:
-	if (error) {
-		uma_zfree(namei_zone, cnp->cn_pnbuf);
-		ndp->ni_vp = NULL;
-		ndp->ni_dvp = NULL;
-		ndp->ni_startdir = NULL;
-		cnp->cn_flags &= ~HASBUF;
-	} else if ((ndp->ni_cnd.cn_flags & (WANTPARENT|LOCKPARENT)) == 0) {
-		ndp->ni_dvp = NULL;
-	}
-	return (error);
-}
-
-/*
- * A fiddled version of m_adj() that ensures null fill to a long
- * boundary and only trims off the back end
- */
-void
-nfsm_adj(struct mbuf *mp, int len, int nul)
-{
-	struct mbuf *m;
-	int count, i;
-	char *cp;
-
-	/*
-	 * Trim from tail.  Scan the mbuf chain,
-	 * calculating its length and finding the last mbuf.
-	 * If the adjustment only affects this mbuf, then just
-	 * adjust and return.  Otherwise, rescan and truncate
-	 * after the remaining size.
-	 */
-	count = 0;
-	m = mp;
-	for (;;) {
-		count += m->m_len;
-		if (m->m_next == NULL)
-			break;
-		m = m->m_next;
-	}
-	if (m->m_len > len) {
-		m->m_len -= len;
-		if (nul > 0) {
-			cp = mtod(m, caddr_t)+m->m_len-nul;
-			for (i = 0; i < nul; i++)
-				*cp++ = '\0';
-		}
-		return;
-	}
-	count -= len;
-	if (count < 0)
-		count = 0;
-	/*
-	 * Correct length for chain is "count".
-	 * Find the mbuf with last data, adjust its length,
-	 * and toss data from remaining mbufs on chain.
-	 */
-	for (m = mp; m; m = m->m_next) {
-		if (m->m_len >= count) {
-			m->m_len = count;
-			if (nul > 0) {
-				cp = mtod(m, caddr_t)+m->m_len-nul;
-				for (i = 0; i < nul; i++)
-					*cp++ = '\0';
-			}
-			if (m->m_next != NULL) {
-				m_freem(m->m_next);
-				m->m_next = NULL;
-			}
-			break;
-		}
-		count -= m->m_len;
-	}
-}
-
-/*
- * Make these functions instead of macros, so that the kernel text size
- * doesn't get too big...
- */
-void
-nfsm_srvwcc(struct nfsrv_descript *nfsd, int before_ret,
-    struct vattr *before_vap, int after_ret, struct vattr *after_vap,
-    struct mbuf **mbp, char **bposp)
-{
-	struct mbuf *mb = *mbp;
-	char *bpos = *bposp;
-	u_int32_t *tl;
-
-	if (before_ret) {
-		tl = nfsm_build(u_int32_t *, NFSX_UNSIGNED);
-		*tl = nfsrv_nfs_false;
-	} else {
-		tl = nfsm_build(u_int32_t *, 7 * NFSX_UNSIGNED);
-		*tl++ = nfsrv_nfs_true;
-		txdr_hyper(before_vap->va_size, tl);
-		tl += 2;
-		txdr_nfsv3time(&(before_vap->va_mtime), tl);
-		tl += 2;
-		txdr_nfsv3time(&(before_vap->va_ctime), tl);
-	}
-	*bposp = bpos;
-	*mbp = mb;
-	nfsm_srvpostopattr(nfsd, after_ret, after_vap, mbp, bposp);
-}
-
-void
-nfsm_srvpostopattr(struct nfsrv_descript *nfsd, int after_ret,
-    struct vattr *after_vap, struct mbuf **mbp, char **bposp)
-{
-	struct mbuf *mb = *mbp;
-	char *bpos = *bposp;
-	u_int32_t *tl;
-	struct nfs_fattr *fp;
-
-	if (after_ret) {
-		tl = nfsm_build(u_int32_t *, NFSX_UNSIGNED);
-		*tl = nfsrv_nfs_false;
-	} else {
-		tl = nfsm_build(u_int32_t *, NFSX_UNSIGNED + NFSX_V3FATTR);
-		*tl++ = nfsrv_nfs_true;
-		fp = (struct nfs_fattr *)tl;
-		nfsm_srvfattr(nfsd, after_vap, fp);
-	}
-	*mbp = mb;
-	*bposp = bpos;
-}
-
-void
-nfsm_srvfattr(struct nfsrv_descript *nfsd, struct vattr *vap,
-    struct nfs_fattr *fp)
-{
-
-	fp->fa_nlink = txdr_unsigned(vap->va_nlink);
-	fp->fa_uid = txdr_unsigned(vap->va_uid);
-	fp->fa_gid = txdr_unsigned(vap->va_gid);
-	if (nfsd->nd_flag & ND_NFSV3) {
-		fp->fa_type = vtonfsv3_type(vap->va_type);
-		fp->fa_mode = vtonfsv3_mode(vap->va_mode);
-		txdr_hyper(vap->va_size, &fp->fa3_size);
-		txdr_hyper(vap->va_bytes, &fp->fa3_used);
-		fp->fa3_rdev.specdata1 = txdr_unsigned(major(vap->va_rdev));
-		fp->fa3_rdev.specdata2 = txdr_unsigned(minor(vap->va_rdev));
-		fp->fa3_fsid.nfsuquad[0] = 0;
-		fp->fa3_fsid.nfsuquad[1] = txdr_unsigned(vap->va_fsid);
-		fp->fa3_fileid.nfsuquad[0] = 0;
-		fp->fa3_fileid.nfsuquad[1] = txdr_unsigned(vap->va_fileid);
-		txdr_nfsv3time(&vap->va_atime, &fp->fa3_atime);
-		txdr_nfsv3time(&vap->va_mtime, &fp->fa3_mtime);
-		txdr_nfsv3time(&vap->va_ctime, &fp->fa3_ctime);
-	} else {
-		fp->fa_type = vtonfsv2_type(vap->va_type);
-		fp->fa_mode = vtonfsv2_mode(vap->va_type, vap->va_mode);
-		fp->fa2_size = txdr_unsigned(vap->va_size);
-		fp->fa2_blocksize = txdr_unsigned(vap->va_blocksize);
-		if (vap->va_type == VFIFO)
-			fp->fa2_rdev = 0xffffffff;
-		else
-			fp->fa2_rdev = txdr_unsigned(vap->va_rdev);
-		fp->fa2_blocks = txdr_unsigned(vap->va_bytes / NFS_FABLKSIZE);
-		fp->fa2_fsid = txdr_unsigned(vap->va_fsid);
-		fp->fa2_fileid = txdr_unsigned(vap->va_fileid);
-		txdr_nfsv2time(&vap->va_atime, &fp->fa2_atime);
-		txdr_nfsv2time(&vap->va_mtime, &fp->fa2_mtime);
-		txdr_nfsv2time(&vap->va_ctime, &fp->fa2_ctime);
-	}
-}
-
-/*
- * nfsrv_fhtovp() - convert a fh to a vnode ptr (optionally locked)
- * 	- look up fsid in mount list (if not found ret error)
- *	- get vp and export rights by calling VFS_FHTOVP()
- *	- if cred->cr_uid == 0 or MNT_EXPORTANON set it to credanon
- */
-int
-nfsrv_fhtovp(fhandle_t *fhp, int flags, struct vnode **vpp,
-    struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-    struct sockaddr *nam, int *rdonlyp)
-{
-	struct mount *mp;
-	int i;
-	struct ucred *cred, *credanon;
-	int error, exflags;
-#ifdef MNT_EXNORESPORT		/* XXX needs mountd and /etc/exports help yet */
-	struct sockaddr_int *saddr;
-#endif
-	int credflavor;
-	int numsecflavors, *secflavors;
-	int authsys;
-	int v3 = nfsd->nd_flag & ND_NFSV3;
-	int mountreq;
-
-	*vpp = NULL;
-
-	if (nfs_ispublicfh(fhp)) {
-		if (!nfs_pub.np_valid)
-			return (ESTALE);
-		fhp = &nfs_pub.np_handle;
-	}
-
-	mp = vfs_busyfs(&fhp->fh_fsid);
-	if (!mp)
-		return (ESTALE);
-	error = VFS_CHECKEXP(mp, nam, &exflags, &credanon,
-	    &numsecflavors, &secflavors);
-	if (error) {
-		vfs_unbusy(mp);
-		goto out;
-	}
-	if (numsecflavors == 0) {
-		/*
-		 * This can happen if the system is running with an
-		 * old mountd that doesn't pass in a secflavor list.
-		 */
-		numsecflavors = 1;
-		authsys = AUTH_SYS;
-		secflavors = &authsys;
-	}
-	credflavor = nfsd->nd_credflavor;
-	for (i = 0; i < numsecflavors; i++) {
-		if (secflavors[i] == credflavor)
-			break;
-	}
-	if (i == numsecflavors) {
-		/*
-		 * RFC 2623 section 2.3.2 - allow certain procedures
-		 * used at NFS client mount time even if they have
-		 * weak authentication.
-		 */
-		mountreq = FALSE;
-		if (v3) {
-			if (nfsd->nd_procnum == NFSPROC_FSINFO
-			    || nfsd->nd_procnum == NFSPROC_GETATTR)
-				mountreq = TRUE;
-		} else {
-			if (nfsd->nd_procnum == NFSPROC_FSSTAT
-			    || nfsd->nd_procnum == NFSPROC_GETATTR)
-				mountreq = TRUE;
-		}
-		if (!mountreq) {
-			error = NFSERR_AUTHERR | AUTH_TOOWEAK;
-			vfs_unbusy(mp);
-			goto out;
-		}
-	}
-	error = VFS_FHTOVP(mp, &fhp->fh_fid, LK_EXCLUSIVE, vpp);
-	if (error) {
-		/* Make sure the server replies ESTALE to the client. */
-		error = ESTALE;
-		vfs_unbusy(mp);
-		goto out;
-	}
-#ifdef MNT_EXNORESPORT
-	if (!(exflags & (MNT_EXNORESPORT|MNT_EXPUBLIC))) {
-		saddr = (struct sockaddr_in *)nam;
-		if ((saddr->sin_family == AF_INET ||
-		     saddr->sin_family == AF_INET6) &&
-	/* same code for INET and INET6: sin*_port at same offet */
-		    ntohs(saddr->sin_port) >= IPPORT_RESERVED) {
-			vput(*vpp);
-			*vpp = NULL;
-			error = NFSERR_AUTHERR | AUTH_TOOWEAK;
-			vfs_unbusy(mp);
-			goto out;
-		}
-	}
-#endif
-	/*
-	 * Check/setup credentials.
-	 */
-	cred = nfsd->nd_cr;
-	if (cred->cr_uid == 0 || (exflags & MNT_EXPORTANON)) {
-		cred->cr_uid = credanon->cr_uid;
-		crsetgroups(cred, credanon->cr_ngroups, credanon->cr_groups);
-	}
-	if (exflags & MNT_EXRDONLY)
-		*rdonlyp = 1;
-	else
-		*rdonlyp = 0;
-
-	if (!(flags & NFSRV_FLAG_BUSY))
-		vfs_unbusy(mp);
-out:
-	if (credanon != NULL)
-		crfree(credanon);
-
-	return (error);
-}
-
-
-/*
- * WebNFS: check if a filehandle is a public filehandle. For v3, this
- * means a length of 0, for v2 it means all zeroes. nfsm_srvmtofh has
- * transformed this to all zeroes in both cases, so check for it.
- */
-int
-nfs_ispublicfh(fhandle_t *fhp)
-{
-	char *cp = (char *)fhp;
-	int i;
-
-	NFSD_LOCK_DONTCARE();
-
-	for (i = 0; i < NFSX_V3FH; i++)
-		if (*cp++ != 0)
-			return (FALSE);
-	return (TRUE);
-}
-
-/*
- * Map errnos to NFS error numbers. For Version 3 also filter out error
- * numbers not specified for the associated procedure.
- */
-int
-nfsrv_errmap(struct nfsrv_descript *nd, int err)
-{
-	const short *defaulterrp, *errp;
-	int e;
-
-
-	if (nd->nd_flag & ND_NFSV3) {
-	    if (nd->nd_procnum <= NFSPROC_COMMIT) {
-		errp = defaulterrp = nfsrv_v3errmap[nd->nd_procnum];
-		while (*++errp) {
-			if (*errp == err)
-				return (err);
-			else if (*errp > err)
-				break;
-		}
-		return ((int)*defaulterrp);
-	    } else
-		return (err & 0xffff);
-	}
-	e = 0;
-	if (err <= ELAST)
-		e = nfsrv_v2errmap[err - 1];
-	if (e != 0)
-		return (e);
-	return (NFSERR_IO);
-}
-
-/*
- * Sort the group list in increasing numerical order.
- * (Insertion sort by Chris Torek, who was grossed out by the bubble sort
- *  that used to be here.)
- */
-void
-nfsrvw_sort(gid_t *list, int num)
-{
-	int i, j;
-	gid_t v;
-
-	/* Insertion sort. */
-	for (i = 1; i < num; i++) {
-		v = list[i];
-		/* find correct slot for value v, moving others up */
-		for (j = i; --j >= 0 && v < list[j];)
-			list[j + 1] = list[j];
-		list[j + 1] = v;
-	}
-}
-
-/*
- * Helper functions for macros.
- */
-
-void
-nfsm_srvfhtom_xx(fhandle_t *f, int v3, struct mbuf **mb, caddr_t *bpos)
-{
-	u_int32_t *tl;
-
-	if (v3) {
-		tl = nfsm_build_xx(NFSX_UNSIGNED + NFSX_V3FH, mb, bpos);
-		*tl++ = txdr_unsigned(NFSX_V3FH);
-		bcopy(f, tl, NFSX_V3FH);
-	} else {
-		tl = nfsm_build_xx(NFSX_V2FH, mb, bpos);
-		bcopy(f, tl, NFSX_V2FH);
-	}
-}
-
-void
-nfsm_srvpostop_fh_xx(fhandle_t *f, struct mbuf **mb, caddr_t *bpos)
-{
-	u_int32_t *tl;
-
-	tl = nfsm_build_xx(2 * NFSX_UNSIGNED + NFSX_V3FH, mb, bpos);
-	*tl++ = nfsrv_nfs_true;
-	*tl++ = txdr_unsigned(NFSX_V3FH);
-	bcopy(f, tl, NFSX_V3FH);
-}
-
-int
-nfsm_srvstrsiz_xx(int *s, int m, struct mbuf **md, caddr_t *dpos)
-{
-	u_int32_t *tl;
-
-	tl = nfsm_dissect_xx_nonblock(NFSX_UNSIGNED, md, dpos);
-	if (tl == NULL)
-		return EBADRPC;
-	*s = fxdr_unsigned(int32_t, *tl);
-	if (*s > m || *s <= 0)
-		return EBADRPC;
-	return 0;
-}
-
-int
-nfsm_srvnamesiz_xx(int *s, int m, struct mbuf **md, caddr_t *dpos)
-{
-	u_int32_t *tl;
-
-	NFSD_LOCK_DONTCARE();
-
-	tl = nfsm_dissect_xx_nonblock(NFSX_UNSIGNED, md, dpos);
-	if (tl == NULL)
-		return EBADRPC;
-	*s = fxdr_unsigned(int32_t, *tl);
-	if (*s > m)
-		return NFSERR_NAMETOL;
-	if (*s <= 0)
-		return EBADRPC;
-	return 0;
-}
-
-int
-nfsm_srvnamesiz0_xx(int *s, int m, struct mbuf **md, caddr_t *dpos)
-{
-	u_int32_t *tl;
-
-	tl = nfsm_dissect_xx_nonblock(NFSX_UNSIGNED, md, dpos);
-	if (tl == NULL)
-		return EBADRPC;
-	*s = fxdr_unsigned(int32_t, *tl);
-	if (*s > m)
-		return NFSERR_NAMETOL;
-	if (*s < 0)
-		return EBADRPC;
-	return 0;
-}
-
-void
-nfsm_clget_xx(u_int32_t **tl, struct mbuf *mb, struct mbuf **mp,
-    char **bp, char **be, caddr_t bpos)
-{
-	struct mbuf *nmp;
-
-	NFSD_UNLOCK_ASSERT();
-
-	if (*bp >= *be) {
-		if (*mp == mb)
-			(*mp)->m_len += *bp - bpos;
-		MGET(nmp, M_WAITOK, MT_DATA);
-		MCLGET(nmp, M_WAITOK);
-		nmp->m_len = NFSMSIZ(nmp);
-		(*mp)->m_next = nmp;
-		*mp = nmp;
-		*bp = mtod(*mp, caddr_t);
-		*be = *bp + (*mp)->m_len;
-	}
-	*tl = (u_int32_t *)*bp;
-}
-
-int
-nfsm_srvmtofh_xx(fhandle_t *f, int v3, struct mbuf **md, caddr_t *dpos)
-{
-	u_int32_t *tl;
-	int fhlen;
-
-	if (v3) {
-		tl = nfsm_dissect_xx_nonblock(NFSX_UNSIGNED, md, dpos);
-		if (tl == NULL)
-			return EBADRPC;
-		fhlen = fxdr_unsigned(int, *tl);
-		if (fhlen != 0 && fhlen != NFSX_V3FH)
-			return EBADRPC;
-	} else {
-		fhlen = NFSX_V2FH;
-	}
-	if (fhlen != 0) {
-		tl = nfsm_dissect_xx_nonblock(fhlen, md, dpos);
-		if (tl == NULL)
-			return EBADRPC;
-		bcopy((caddr_t)tl, (caddr_t)(f), fhlen);
-	} else {
-		bzero((caddr_t)(f), NFSX_V3FH);
-	}
-	return 0;
-}
-
-int
-nfsm_srvsattr_xx(struct vattr *a, struct mbuf **md, caddr_t *dpos)
-{
-	u_int32_t *tl;
-	int toclient = 0;
-
-	tl = nfsm_dissect_xx_nonblock(NFSX_UNSIGNED, md, dpos);
-	if (tl == NULL)
-		return EBADRPC;
-	if (*tl == nfsrv_nfs_true) {
-		tl = nfsm_dissect_xx_nonblock(NFSX_UNSIGNED, md, dpos);
-		if (tl == NULL)
-			return EBADRPC;
-		(a)->va_mode = nfstov_mode(*tl);
-	}
-	tl = nfsm_dissect_xx_nonblock(NFSX_UNSIGNED, md, dpos);
-	if (tl == NULL)
-		return EBADRPC;
-	if (*tl == nfsrv_nfs_true) {
-		tl = nfsm_dissect_xx_nonblock(NFSX_UNSIGNED, md, dpos);
-		if (tl == NULL)
-			return EBADRPC;
-		(a)->va_uid = fxdr_unsigned(uid_t, *tl);
-	}
-	tl = nfsm_dissect_xx_nonblock(NFSX_UNSIGNED, md, dpos);
-	if (tl == NULL)
-		return EBADRPC;
-	if (*tl == nfsrv_nfs_true) {
-		tl = nfsm_dissect_xx_nonblock(NFSX_UNSIGNED, md, dpos);
-		if (tl == NULL)
-			return EBADRPC;
-		(a)->va_gid = fxdr_unsigned(gid_t, *tl);
-	}
-	tl = nfsm_dissect_xx_nonblock(NFSX_UNSIGNED, md, dpos);
-	if (tl == NULL)
-		return EBADRPC;
-	if (*tl == nfsrv_nfs_true) {
-		tl = nfsm_dissect_xx_nonblock(2 * NFSX_UNSIGNED, md, dpos);
-		if (tl == NULL)
-			return EBADRPC;
-		(a)->va_size = fxdr_hyper(tl);
-	}
-	tl = nfsm_dissect_xx_nonblock(NFSX_UNSIGNED, md, dpos);
-	if (tl == NULL)
-		return EBADRPC;
-	switch (fxdr_unsigned(int, *tl)) {
-	case NFSV3SATTRTIME_TOCLIENT:
-		tl = nfsm_dissect_xx_nonblock(2 * NFSX_UNSIGNED, md, dpos);
-		if (tl == NULL)
-			return EBADRPC;
-		fxdr_nfsv3time(tl, &(a)->va_atime);
-		toclient = 1;
-		break;
-	case NFSV3SATTRTIME_TOSERVER:
-		vfs_timestamp(&a->va_atime);
-		a->va_vaflags |= VA_UTIMES_NULL;
-		break;
-	}
-	tl = nfsm_dissect_xx_nonblock(NFSX_UNSIGNED, md, dpos);
-	if (tl == NULL)
-		return EBADRPC;
-	switch (fxdr_unsigned(int, *tl)) {
-	case NFSV3SATTRTIME_TOCLIENT:
-		tl = nfsm_dissect_xx_nonblock(2 * NFSX_UNSIGNED, md, dpos);
-		if (tl == NULL)
-			return EBADRPC;
-		fxdr_nfsv3time(tl, &(a)->va_mtime);
-		a->va_vaflags &= ~VA_UTIMES_NULL;
-		break;
-	case NFSV3SATTRTIME_TOSERVER:
-		vfs_timestamp(&a->va_mtime);
-		if (toclient == 0)
-			a->va_vaflags |= VA_UTIMES_NULL;
-		break;
-	}
-	return 0;
-}