nfs: Cleanup dead files

These files are no longer used by the FreeBSD base system. They were being used by the amd port but that has also been deleted.

Reviewed by:	rmacklem
Sponsored by:	Google
Differential Revision:	https://reviews.freebsd.org/D29180

7 files changed, 8 insertions, 625 deletions

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index f111a2f83064..bb1a19ec5ceb 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -36,6 +36,14 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20210316: remove obsolete NFS headers
+OLD_FILES+=usr/include/nfs/nfs_common.h
+OLD_FILES+=usr/include/nfsclient/nfsm_subs.h
+OLD_FILES+=usr/include/nfsclient/nlminfo.h
+OLD_FILES+=usr/include/nfsserver/nfs_fha_old.h
+OLD_FILES+=usr/include/nfsserver/nfsm_subs.h
+OLD_FILES+=usr/include/nfsserver/nfsrvcache.h
+
 # 20210315: Remove kernel-only crypto headers from /usr/include
 OLD_FILES+=usr/include/crypto/_cryptodev.h
 OLD_FILES+=usr/include/crypto/cbc_mac.h
diff --git a/sys/nfs/nfs_common.h b/sys/nfs/nfs_common.h
deleted file mode 100644
index a821934da0a2..000000000000
--- a/sys/nfs/nfs_common.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * 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.
- * 3. 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.
- *
- *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD$
- */
-
-#ifndef _NFS_NFS_COMMON_H_
-#define _NFS_NFS_COMMON_H_
-
-extern enum vtype nv3tov_type[];
-extern nfstype nfsv3_type[];
-
-#define	vtonfsv2_mode(t, m) \
-    txdr_unsigned(((t) == VFIFO) ? MAKEIMODE(VCHR, (m)) : MAKEIMODE((t), (m)))
-
-#define	nfsv3tov_type(a)	nv3tov_type[fxdr_unsigned(u_int32_t,(a))&0x7]
-#define	vtonfsv3_type(a)	txdr_unsigned(nfsv3_type[((int32_t)(a))])
-
-int	nfs_adv(struct mbuf **, caddr_t *, int, int);
-void	*nfsm_disct(struct mbuf **, caddr_t *, int, int, int);
-int	nfs_realign(struct mbuf **, int);
-
-/* ****************************** */
-/* Build request/reply phase macros */
-
-void	*nfsm_build_xx(int s, struct mbuf **mb, caddr_t *bpos);
-
-#define	nfsm_build(c, s) \
-	(c)nfsm_build_xx((s), &mb, &bpos)
-
-/* ****************************** */
-/* Interpretation phase macros */
-
-void	*nfsm_dissect_xx(int s, struct mbuf **md, caddr_t *dpos);
-void	*nfsm_dissect_xx_nonblock(int s, struct mbuf **md, caddr_t *dpos);
-int	nfsm_strsiz_xx(int *s, int m, struct mbuf **md, caddr_t *dpos);
-int	nfsm_adv_xx(int s, struct mbuf **md, caddr_t *dpos);
-
-/* Error check helpers */
-#define nfsm_dcheck(t1, mrep) \
-do { \
-	if (t1 != 0) { \
-		error = t1; \
-		m_freem((mrep)); \
-		(mrep) = NULL; \
-		goto nfsmout; \
-	} \
-} while (0)
-
-#define nfsm_dcheckp(retp, mrep) \
-do { \
-	if (retp == NULL) { \
-		error = EBADRPC; \
-		m_freem((mrep)); \
-		(mrep) = NULL; \
-		goto nfsmout; \
-	} \
-} while (0)
-
-#define	nfsm_dissect(c, s) \
-({ \
-	void *ret; \
-	ret = nfsm_dissect_xx((s), &md, &dpos); \
-	nfsm_dcheckp(ret, mrep); \
-	(c)ret; \
-})
-
-#define	nfsm_dissect_nonblock(c, s) \
-({ \
-	void *ret; \
-	ret = nfsm_dissect_xx_nonblock((s), &md, &dpos); \
-	nfsm_dcheckp(ret, mrep); \
-	(c)ret; \
-})
-
-#define	nfsm_strsiz(s,m) \
-do { \
-	int t1; \
-	t1 = nfsm_strsiz_xx(&(s), (m), &md, &dpos); \
-	nfsm_dcheck(t1, mrep); \
-} while(0)
-
-#define nfsm_mtouio(p,s) \
-do {\
-	int32_t t1 = 0; \
-	if ((s) > 0) \
-		t1 = nfsm_mbuftouio(&md, (p), (s), &dpos); \
-	nfsm_dcheck(t1, mrep); \
-} while (0)
-
-#define nfsm_rndup(a)	(((a)+3)&(~0x3))
-
-#define	nfsm_adv(s) \
-do { \
-	int t1; \
-	t1 = nfsm_adv_xx((s), &md, &dpos); \
-	nfsm_dcheck(t1, mrep); \
-} while (0)
-
-#ifdef __NO_STRICT_ALIGNMENT
-#define nfsm_aligned(p, t)	1
-#else
-#define nfsm_aligned(p, t)	((((u_long)(p)) & (sizeof(t) - 1)) == 0)
-#endif
-
-#endif
diff --git a/sys/nfsclient/nfsm_subs.h b/sys/nfsclient/nfsm_subs.h
deleted file mode 100644
index b918e78ae728..000000000000
--- a/sys/nfsclient/nfsm_subs.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * 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.
- * 3. 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.
- *
- *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD$
- */
-
-#ifndef _NFSCLIENT_NFSM_SUBS_H_
-#define _NFSCLIENT_NFSM_SUBS_H_
-
-#include <nfs/nfs_common.h>
-
-#define	nfsv2tov_type(a)	nv2tov_type[fxdr_unsigned(u_int32_t,(a))&0x7]
-
-struct ucred;
-struct vnode;
-
-/*
- * These macros do strange and peculiar things to mbuf chains for
- * the assistance of the nfs code. To attempt to use them for any
- * other purpose will be dangerous. (they make weird assumptions)
- */
-
-/*
- * First define what the actual subs. return
- */
-u_int32_t nfs_xid_gen(void);
-
-/* *********************************** */
-/* Request generation phase macros */
-
-int	nfsm_fhtom_xx(struct vnode *v, int v3, struct mbuf **mb,
-	    caddr_t *bpos);
-void	nfsm_v3attrbuild_xx(struct vattr *va, int full, struct mbuf **mb,
-	    caddr_t *bpos);
-int	nfsm_strtom_xx(const char *a, int s, int m, struct mbuf **mb,
-	    caddr_t *bpos);
-
-#define nfsm_bcheck(t1, mreq) \
-do { \
-	if (t1) { \
-		error = t1; \
-		m_freem(mreq); \
-		goto nfsmout; \
-	} \
-} while (0)
-
-#define nfsm_fhtom(v, v3) \
-do { \
-	int32_t t1; \
-	t1 = nfsm_fhtom_xx((v), (v3), &mb, &bpos); \
-	nfsm_bcheck(t1, mreq); \
-} while (0)
-
-/* If full is true, set all fields, otherwise just set mode and time fields */
-#define nfsm_v3attrbuild(a, full) \
-	nfsm_v3attrbuild_xx(a, full, &mb, &bpos)
-
-#define nfsm_uiotom(p, s) \
-do { \
-	int t1; \
-	t1 = nfsm_uiotombuf((p), &mb, (s), &bpos); \
-	nfsm_bcheck(t1, mreq); \
-} while (0)
-
-#define	nfsm_strtom(a, s, m) \
-do { \
-	int t1; \
-	t1 = nfsm_strtom_xx((a), (s), (m), &mb, &bpos); \
-	nfsm_bcheck(t1, mreq); \
-} while (0)
-
-/* *********************************** */
-/* Send the request */
-
-#define	nfsm_request(v, t, p, c) \
-do { \
-	sigset_t oldset; \
-	nfs_set_sigmask(p, &oldset); \
-	error = nfs_request((v), mreq, (t), (p), (c), &mrep, &md, &dpos); \
-	nfs_restore_sigmask(p, &oldset); \
-	if (error != 0) { \
-		if (error & NFSERR_RETERR) \
-			error &= ~NFSERR_RETERR; \
-		else \
-			goto nfsmout; \
-	} \
-} while (0)
-
-/* *********************************** */
-/* Reply interpretation phase macros */
-
-int	nfsm_mtofh_xx(struct vnode *d, struct vnode **v, int v3, int *f,
-	    struct mbuf **md, caddr_t *dpos);
-int	nfsm_getfh_xx(nfsfh_t **f, int *s, int v3, struct mbuf **md,
-	    caddr_t *dpos);
-int	nfsm_loadattr_xx(struct vnode **v, struct vattr *va, struct mbuf **md,
-	    caddr_t *dpos);
-int	nfsm_postop_attr_xx(struct vnode **v, int *f, struct vattr *va,
-	    struct mbuf **md, caddr_t *dpos);
-int	nfsm_wcc_data_xx(struct vnode **v, int *f, struct mbuf **md,
-	    caddr_t *dpos);
-
-#define nfsm_mtofh(d, v, v3, f) \
-do { \
-	int32_t t1; \
-	t1 = nfsm_mtofh_xx((d), &(v), (v3), &(f), &md, &dpos); \
-	nfsm_dcheck(t1, mrep); \
-} while (0)
-
-#define nfsm_getfh(f, s, v3) \
-do { \
-	int32_t t1; \
-	t1 = nfsm_getfh_xx(&(f), &(s), (v3), &md, &dpos); \
-	nfsm_dcheck(t1, mrep); \
-} while (0)
-
-#define	nfsm_loadattr(v, a) \
-do { \
-	int32_t t1; \
-	t1 = nfsm_loadattr_xx(&v, a, &md, &dpos); \
-	nfsm_dcheck(t1, mrep); \
-} while (0)
-
-#define	nfsm_postop_attr(v, f) \
-do { \
-	int32_t t1; \
-	t1 = nfsm_postop_attr_xx(&v, &f, NULL, &md, &dpos);	\
-	nfsm_dcheck(t1, mrep); \
-} while (0)
-
-#define	nfsm_postop_attr_va(v, f, va)		\
-do { \
-	int32_t t1; \
-	t1 = nfsm_postop_attr_xx(&v, &f, va, &md, &dpos);	\
-	nfsm_dcheck(t1, mrep); \
-} while (0)
-
-/* Used as (f) for nfsm_wcc_data() */
-#define NFSV3_WCCRATTR	0
-#define NFSV3_WCCCHK	1
-
-#define	nfsm_wcc_data(v, f) \
-do { \
-	int32_t t1; \
-	t1 = nfsm_wcc_data_xx(&v, &f, &md, &dpos); \
-	nfsm_dcheck(t1, mrep); \
-} while (0)
-
-#endif
diff --git a/sys/nfsclient/nlminfo.h b/sys/nfsclient/nlminfo.h
deleted file mode 100644
index 340bdbe5faa2..000000000000
--- a/sys/nfsclient/nlminfo.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * Copyright (c) 1998 Berkeley Software Design, Inc. All rights reserved.
- * 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.
- * 3. Berkeley Software Design Inc's name may not be used to endorse or
- *    promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN INC ``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 BERKELEY SOFTWARE DESIGN INC 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.
- *
- *      from BSDI nlminfo.h,v 2.1 1998/03/18 01:30:38 don Exp
- * $FreeBSD$
- */
-
-/*
- * Misc NLM informationi, some needed for the master lockd process, and some
- * needed by every process doing nlm based locking.
- */
-struct  nlminfo {
-	/* these are used by any process doing nlm locking */
-        int             msg_seq;        /* sequence counter for lock requests */
-        int             retcode;        /* return code for lock requests */
-	int		set_getlk_pid;
-	int		getlk_pid;
-        struct  timeval pid_start;      /* process starting time */
-};
diff --git a/sys/nfsserver/nfs_fha_old.h b/sys/nfsserver/nfs_fha_old.h
deleted file mode 100644
index c7845aca8157..000000000000
--- a/sys/nfsserver/nfs_fha_old.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * 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.
- */
-/* $FreeBSD$ */
-
-#ifndef	_NFS_FHA_OLD_H
-#define	_NFS_FHA_OLD_H 1
-
-#ifdef	_KERNEL
-
-#define	FHAOLD_SERVER_NAME	"nfsrv"
-
-SVCTHREAD *fhaold_assign(SVCTHREAD *this_thread, struct svc_req *req);
-#endif /* _KERNEL */
-
-#endif /* _NFS_FHA_OLD_H */
diff --git a/sys/nfsserver/nfsm_subs.h b/sys/nfsserver/nfsm_subs.h
deleted file mode 100644
index 10c34ba634ed..000000000000
--- a/sys/nfsserver/nfsm_subs.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * 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.
- * 3. 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.
- *
- *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD$
- */
-
-#ifndef _NFSSERVER_NFSM_SUBS_H_
-#define _NFSSERVER_NFSM_SUBS_H_
-
-#include <nfs/nfs_common.h>
-
-#define	nfstov_mode(a)	(fxdr_unsigned(u_int32_t, (a)) & ALLPERMS)
-
-/*
- * These macros do strange and peculiar things to mbuf chains for
- * the assistance of the nfs code. To attempt to use them for any
- * other purpose will be dangerous. (they make weird assumptions)
- */
-
-/*
- * Now for the macros that do the simple stuff and call the functions
- * for the hard stuff.
- * These macros use several vars. declared in nfsm_reqhead and these
- * vars. must not be used elsewhere unless you are careful not to corrupt
- * them. The vars. starting with pN and tN (N=1,2,3,..) are temporaries
- * that may be used so long as the value is not expected to retained
- * after a macro.
- * I know, this is kind of dorkey, but it makes the actual op functions
- * fairly clean and deals with the mess caused by the xdr discriminating
- * unions.
- */
-
-/* ************************************* */
-/* Dissection phase macros */
-
-int	nfsm_srvstrsiz_xx(int *s, int m, struct mbuf **md, caddr_t *dpos);
-int	nfsm_srvnamesiz_xx(int *s, int m, struct mbuf **md, caddr_t *dpos);
-int	nfsm_srvnamesiz0_xx(int *s, int m, struct mbuf **md, caddr_t *dpos);
-int	nfsm_srvmtofh_xx(fhandle_t *f, int v3, struct mbuf **md, caddr_t *dpos);
-int	nfsm_srvsattr_xx(struct vattr *a, struct mbuf **md, caddr_t *dpos);
-
-#define	nfsm_srvstrsiz(s, m) \
-do { \
-	int t1; \
-	t1 = nfsm_srvstrsiz_xx(&(s), (m), &md, &dpos); \
-	if (t1) { \
-		error = t1; \
-		nfsm_reply(0); \
-	} \
-} while (0)
-
-#define	nfsm_srvnamesiz(s) \
-do { \
-	int t1; \
-	t1 = nfsm_srvnamesiz_xx(&(s), NFS_MAXNAMLEN, &md, &dpos); \
-	if (t1) { \
-		error = t1; \
-		nfsm_reply(0); \
-	} \
-} while (0)
-
-#define	nfsm_srvpathsiz(s) \
-do { \
-	int t1; \
-	t1 = nfsm_srvnamesiz0_xx(&(s), NFS_MAXPATHLEN, &md, &dpos); \
-	if (t1) { \
-		error = t1; \
-		nfsm_reply(0); \
-	} \
-} while (0)
-
-#define nfsm_srvmtofh(f) \
-do { \
-	int t1; \
-	t1 = nfsm_srvmtofh_xx((f), nfsd->nd_flag & ND_NFSV3, &md, &dpos); \
-	if (t1) { \
-		error = t1; \
-		nfsm_reply(0); \
-	} \
-} while (0)
-
-/* XXX why is this different? */
-#define nfsm_srvsattr(a) \
-do { \
-	int t1; \
-	t1 = nfsm_srvsattr_xx((a), &md, &dpos); \
-	if (t1) { \
-		error = t1; \
-		m_freem(mrep); \
-		mrep = NULL; \
-		goto nfsmout; \
-	} \
-} while (0)
-
-/* ************************************* */
-/* Prepare the reply */
-
-#define	nfsm_reply(s) \
-do { \
-	if (mrep != NULL) { \
-		m_freem(mrep); \
-		mrep = NULL; \
-	} \
-	mreq = nfs_rephead((s), nfsd, error, &mb, &bpos); \
-	*mrq = mreq; \
-	if (error == EBADRPC) { \
-		error = 0; \
-		goto nfsmout; \
-	} \
-} while (0)
-
-#define	nfsm_writereply(s) \
-do { \
-	mreq = nfs_rephead((s), nfsd, error, &mb, &bpos); \
-} while(0)
-
-/* ************************************* */
-/* Reply phase macros - add additional reply info */
-
-void	nfsm_srvfhtom_xx(fhandle_t *f, int v3, struct mbuf **mb,
-	    caddr_t *bpos);
-void	nfsm_srvpostop_fh_xx(fhandle_t *f, struct mbuf **mb, caddr_t *bpos);
-void	nfsm_clget_xx(u_int32_t **tl, struct mbuf *mb, struct mbuf **mp,
-	    char **bp, char **be, caddr_t bpos);
-
-#define nfsm_srvfhtom(f, v3) \
-	nfsm_srvfhtom_xx((f), (v3), &mb, &bpos)
-
-#define nfsm_srvpostop_fh(f) \
-	nfsm_srvpostop_fh_xx((f), &mb, &bpos)
-
-#define nfsm_srvwcc_data(br, b, ar, a) \
-	nfsm_srvwcc(nfsd, (br), (b), (ar), (a), &mb, &bpos)
-
-#define nfsm_srvpostop_attr(r, a) \
-	nfsm_srvpostopattr(nfsd, (r), (a), &mb, &bpos)
-
-#define	nfsm_srvfillattr(a, f) \
-	nfsm_srvfattr(nfsd, (a), (f))
-
-#define nfsm_clget \
-	nfsm_clget_xx(&tl, mb, &mp, &bp, &be, bpos)
-
-#endif
diff --git a/sys/nfsserver/nfsrvcache.h b/sys/nfsserver/nfsrvcache.h
deleted file mode 100644
index 10dff78538cd..000000000000
--- a/sys/nfsserver/nfsrvcache.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
- * 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.
- * 3. 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.
- *
- *	@(#)nfsrvcache.h	8.3 (Berkeley) 3/30/95
- * $FreeBSD$
- */
-
-#ifndef _NFSSERVER_NFSRVCACHE_H_
-#define _NFSSERVER_NFSRVCACHE_H_
-
-#include <sys/queue.h>
-
-/*
- * Definitions for the server recent request cache
- */
-#define NFSRVCACHE_MAX_SIZE	2048
-#define NFSRVCACHE_MIN_SIZE	  64
-
-#endif