Index: sys/fs/nfs/nfs_var.h
===================================================================
--- sys/fs/nfs/nfs_var.h
+++ sys/fs/nfs/nfs_var.h
@@ -635,7 +635,7 @@
     NFSPROC_T *, int, nfsattrbit_t *);
 int nfsvno_setattr(vnode_t, struct nfsvattr *, struct ucred *,
     NFSPROC_T *, struct nfsexstuff *);
-int nfsvno_getfh(vnode_t, fhandle_t *, NFSPROC_T *);
+int nfsvno_getfh(vnode_t, fhandle_t *);
 int nfsvno_accchk(vnode_t, accmode_t, struct ucred *,
     struct nfsexstuff *, NFSPROC_T *, int, int, u_int32_t *);
 int nfsvno_namei(struct nfsrv_descript *, struct nameidata *,
Index: sys/fs/nfsserver/nfs_nfsdport.c
===================================================================
--- sys/fs/nfsserver/nfs_nfsdport.c
+++ sys/fs/nfsserver/nfs_nfsdport.c
@@ -324,7 +324,7 @@
  * Get a file handle for a vnode.
  */
 int
-nfsvno_getfh(struct vnode *vp, fhandle_t *fhp, struct thread *p)
+nfsvno_getfh(struct vnode *vp, fhandle_t *fhp)
 {
 	int error;
 
@@ -2441,7 +2441,7 @@
 				if (refp == NULL &&
 				    ((nd->nd_flag & ND_NFSV3) ||
 				     NFSNONZERO_ATTRBIT(&attrbits))) {
-					r = nfsvno_getfh(nvp, &nfh, p);
+					r = nfsvno_getfh(nvp, &nfh);
 					if (!r)
 					    r = nfsvno_getattr(nvp, nvap, nd, p,
 						1, &attrbits);
@@ -3187,7 +3187,7 @@
 		    nfsexargp->fspec, p);
 		if ((error = namei(&nd)) != 0)
 			goto out;
-		error = nfsvno_getfh(nd.ni_vp, &fh, p);
+		error = nfsvno_getfh(nd.ni_vp, &fh);
 		vrele(nd.ni_vp);
 		if (!error) {
 			nfs_rootfh.nfsrvfh_len = NFSX_MYFH;
@@ -3974,7 +3974,7 @@
 	tpf = pf = malloc(sizeof(*pf) * nfsrv_maxpnfsmirror, M_TEMP, M_WAITOK |
 	    M_ZERO);
 
-	error = nfsvno_getfh(vp, &fh, p);
+	error = nfsvno_getfh(vp, &fh);
 	if (error == 0)
 		error = VOP_GETATTR(vp, &va, cred);
 	if (error == 0) {
@@ -4143,7 +4143,7 @@
 	if (va.va_nlink > 1)
 		return;
 
-	error = nfsvno_getfh(vp, fhp, p);
+	error = nfsvno_getfh(vp, fhp);
 	if (error != 0) {
 		printf("pNFS: nfsrv_pnfsremovesetup getfh=%d\n", error);
 		return;
Index: sys/fs/nfsserver/nfs_nfsdserv.c
===================================================================
--- sys/fs/nfsserver/nfs_nfsdserv.c
+++ sys/fs/nfsserver/nfs_nfsdserv.c
@@ -253,7 +253,7 @@
 	if (!nd->nd_repstat) {
 		if (nd->nd_flag & ND_NFSV4) {
 			if (NFSISSET_ATTRBIT(&attrbits, NFSATTRBIT_FILEHANDLE))
-				nd->nd_repstat = nfsvno_getfh(vp, &fh, p);
+				nd->nd_repstat = nfsvno_getfh(vp, &fh);
 			if (!nd->nd_repstat)
 				nd->nd_repstat = nfsrv_checkgetattr(nd, vp,
 				    &nva, &attrbits, p);
@@ -588,7 +588,7 @@
 		 */
 		nd->nd_repstat = ENOENT;
 	if (nd->nd_repstat == 0)
-		nd->nd_repstat = nfsvno_getfh(vp, fhp, p);
+		nd->nd_repstat = nfsvno_getfh(vp, fhp);
 	if (!(nd->nd_flag & ND_NFSV4) && !nd->nd_repstat)
 		nd->nd_repstat = nfsvno_getattr(vp, &nva, nd, p, 1, NULL);
 	if (vpp != NULL && nd->nd_repstat == 0)
@@ -1188,7 +1188,7 @@
 	    &exclusive_flag, cverf, rdev, exp);
 
 	if (!nd->nd_repstat) {
-		nd->nd_repstat = nfsvno_getfh(vp, &fh, p);
+		nd->nd_repstat = nfsvno_getfh(vp, &fh);
 		if (!nd->nd_repstat)
 			nd->nd_repstat = nfsvno_getattr(vp, &nva, nd, p, 1,
 			    NULL);
@@ -1395,7 +1395,7 @@
 	if (!nd->nd_repstat) {
 		vp = named.ni_vp;
 		nfsrv_fixattr(nd, vp, &nva, aclp, p, &attrbits, exp);
-		nd->nd_repstat = nfsvno_getfh(vp, fhp, p);
+		nd->nd_repstat = nfsvno_getfh(vp, fhp);
 		if ((nd->nd_flag & ND_NFSV3) && !nd->nd_repstat)
 			nd->nd_repstat = nfsvno_getattr(vp, &nva, nd, p, 1,
 			    NULL);
@@ -1588,7 +1588,7 @@
 		tfh.nfsrvfh_len = 0;
 		error = nfsrv_mtofh(nd, &tfh);
 		if (error == 0)
-			error = nfsvno_getfh(dp, &fh, p);
+			error = nfsvno_getfh(dp, &fh);
 		if (error) {
 			vput(dp);
 			/* todp is always NULL except NFSv4 */
@@ -1893,7 +1893,7 @@
 	if (!nd->nd_repstat && !(nd->nd_flag & ND_NFSV2)) {
 		nfsrv_fixattr(nd, ndp->ni_vp, nvap, aclp, p, attrbitp, exp);
 		if (nd->nd_flag & ND_NFSV3) {
-			nd->nd_repstat = nfsvno_getfh(ndp->ni_vp, fhp, p);
+			nd->nd_repstat = nfsvno_getfh(ndp->ni_vp, fhp);
 			if (!nd->nd_repstat)
 				nd->nd_repstat = nfsvno_getattr(ndp->ni_vp,
 				    nvap, nd, p, 1, NULL);
@@ -2027,7 +2027,7 @@
 	if (!nd->nd_repstat) {
 		vp = ndp->ni_vp;
 		nfsrv_fixattr(nd, vp, nvap, aclp, p, attrbitp, exp);
-		nd->nd_repstat = nfsvno_getfh(vp, fhp, p);
+		nd->nd_repstat = nfsvno_getfh(vp, fhp);
 		if (!(nd->nd_flag & ND_NFSV4) && !nd->nd_repstat)
 			nd->nd_repstat = nfsvno_getattr(vp, nvap, nd, p, 1,
 			    NULL);
@@ -3346,9 +3346,8 @@
     vnode_t vp, __unused struct nfsexstuff *exp)
 {
 	fhandle_t fh;
-	struct thread *p = curthread;
 
-	nd->nd_repstat = nfsvno_getfh(vp, &fh, p);
+	nd->nd_repstat = nfsvno_getfh(vp, &fh);
 	vput(vp);
 	if (!nd->nd_repstat)
 		(void) nfsm_fhtom(nd, (u_int8_t *)&fh, 0, 0);
@@ -3607,7 +3606,7 @@
 	nfsvno_relpathbuf(&named);
 	fh.nfsrvfh_len = NFSX_MYFH;
 	vp = named.ni_vp;
-	nd->nd_repstat = nfsvno_getfh(vp, (fhandle_t *)fh.nfsrvfh_data, p);
+	nd->nd_repstat = nfsvno_getfh(vp, (fhandle_t *)fh.nfsrvfh_data);
 	vput(vp);
 	savflag = nd->nd_flag;
 	if (!nd->nd_repstat) {
@@ -3847,7 +3846,7 @@
 	if (!nd->nd_repstat)
 		nd->nd_repstat = nfsvno_statfs(vp, sf);
 	if (!nd->nd_repstat)
-		nd->nd_repstat = nfsvno_getfh(vp, &fh, p);
+		nd->nd_repstat = nfsvno_getfh(vp, &fh);
 	if (!nd->nd_repstat) {
 		nfsvno_getfs(&fs, isdgram);
 		error = nfsv4_loadattr(nd, vp, &nva, NULL, &fh, fhsize, NULL,
Index: sys/fs/nfsserver/nfs_nfsdstate.c
===================================================================
--- sys/fs/nfsserver/nfs_nfsdstate.c
+++ sys/fs/nfsserver/nfs_nfsdstate.c
@@ -3528,7 +3528,7 @@
 	 * Do a sanity check against the file handle for DelegReturn.
 	 */
 	if (vp) {
-		error = nfsvno_getfh(vp, &fh, p);
+		error = nfsvno_getfh(vp, &fh);
 		if (error)
 			goto out;
 	}
@@ -3682,7 +3682,7 @@
 	} else {
 		panic("nfsrv_getlockfh");
 	}
-	error = nfsvno_getfh(vp, fhp, p);
+	error = nfsvno_getfh(vp, fhp);
 	NFSEXITCODE(error);
 	return (error);
 }
@@ -6494,7 +6494,7 @@
 	if (*offset != 0)
 		printf("nfsrv_layoutget: off=%ju len=%ju\n", (uintmax_t)*offset,
 		    (uintmax_t)*len);
-	error = nfsvno_getfh(vp, &fh, p);
+	error = nfsvno_getfh(vp, &fh);
 	NFSD_DEBUG(4, "layoutget getfh=%d\n", error);
 	if (error != 0)
 		return (error);
@@ -6966,7 +6966,7 @@
 
 	*fndp = 0;
 	if (kind == NFSV4LAYOUTRET_FILE) {
-		error = nfsvno_getfh(vp, &fh, p);
+		error = nfsvno_getfh(vp, &fh);
 		if (error == 0) {
 			error = nfsrv_updatemdsattr(vp, &na, p);
 			if (error != 0)
@@ -7835,7 +7835,7 @@
 	nfsquad_t clid[NFSCLIDVECSIZE];
 	int clidcnt, ret;
 
-	ret = nfsvno_getfh(vp, &fh, p);
+	ret = nfsvno_getfh(vp, &fh);
 	if (ret != 0)
 		return (0);
 
@@ -7996,7 +7996,7 @@
 	 * Allocate a nfsdontlist entry and set the NFSMR_DONTLAYOUT flag
 	 * so that no more RW layouts will get issued.
 	 */
-	ret = nfsvno_getfh(vp, &fh, p);
+	ret = nfsvno_getfh(vp, &fh);
 	if (ret != 0) {
 		NFSD_DEBUG(4, "nfsrv_copymr: getfh=%d\n", ret);
 		return (ret);