Index: sys/fs/nfs/nfs_var.h
===================================================================
--- sys/fs/nfs/nfs_var.h
+++ sys/fs/nfs/nfs_var.h
@@ -114,7 +114,7 @@
     struct nfsstate **, nfsquad_t, nfsv4stateid_t *, nfsv4stateid_t *, 
     u_int32_t *, struct nfsexstuff *, NFSPROC_T *, u_quad_t);
 int nfsrv_opencheck(nfsquad_t, nfsv4stateid_t *, struct nfsstate *,
-    vnode_t, struct nfsrv_descript *, NFSPROC_T *, int);
+    vnode_t, struct nfsrv_descript *, int);
 int nfsrv_openupdate(vnode_t, struct nfsstate *, nfsquad_t,
     nfsv4stateid_t *, struct nfsrv_descript *, NFSPROC_T *, int *);
 int nfsrv_delegupdate(struct nfsrv_descript *, nfsquad_t, nfsv4stateid_t *,
Index: sys/fs/nfsserver/nfs_nfsdport.c
===================================================================
--- sys/fs/nfsserver/nfs_nfsdport.c
+++ sys/fs/nfsserver/nfs_nfsdport.c
@@ -1642,7 +1642,7 @@
 
 	if (ndp->ni_vp == NULL)
 		nd->nd_repstat = nfsrv_opencheck(clientid,
-		    stateidp, stp, NULL, nd, p, nd->nd_repstat);
+		    stateidp, stp, NULL, nd, nd->nd_repstat);
 	if (!nd->nd_repstat) {
 		if (ndp->ni_vp == NULL) {
 			vrele(ndp->ni_startdir);
@@ -1702,7 +1702,7 @@
 				    NFSACCCHK_NOOVERRIDE,
 				    NFSACCCHK_VPISLOCKED, NULL);
 				nd->nd_repstat = nfsrv_opencheck(clientid,
-				    stateidp, stp, vp, nd, p, nd->nd_repstat);
+				    stateidp, stp, vp, nd, nd->nd_repstat);
 				if (!nd->nd_repstat) {
 					tempsize = nvap->na_size;
 					NFSVNO_ATTRINIT(nvap);
@@ -1712,7 +1712,7 @@
 				}
 			} else if (vp->v_type == VREG) {
 				nd->nd_repstat = nfsrv_opencheck(clientid,
-				    stateidp, stp, vp, nd, p, nd->nd_repstat);
+				    stateidp, stp, vp, nd, nd->nd_repstat);
 			}
 		}
 	} else {
Index: sys/fs/nfsserver/nfs_nfsdserv.c
===================================================================
--- sys/fs/nfsserver/nfs_nfsdserv.c
+++ sys/fs/nfsserver/nfs_nfsdserv.c
@@ -2933,7 +2933,7 @@
 			nd->nd_repstat = NFSERR_INVAL;
 		if (nd->nd_repstat) {
 			nd->nd_repstat = nfsrv_opencheck(clientid,
-			    &stateid, stp, NULL, nd, p, nd->nd_repstat);
+			    &stateid, stp, NULL, nd, nd->nd_repstat);
 			goto nfsmout;
 		}
 		if (create == NFSV4OPEN_CREATE)
@@ -3019,7 +3019,7 @@
 		NFSVOPLOCK(vp, LK_EXCLUSIVE | LK_RETRY);
 		if ((vp->v_iflag & VI_DOOMED) == 0)
 			nd->nd_repstat = nfsrv_opencheck(clientid, &stateid,
-			    stp, vp, nd, p, nd->nd_repstat);
+			    stp, vp, nd, nd->nd_repstat);
 		else
 			nd->nd_repstat = NFSERR_PERM;
 	} else {
Index: sys/fs/nfsserver/nfs_nfsdstate.c
===================================================================
--- sys/fs/nfsserver/nfs_nfsdstate.c
+++ sys/fs/nfsserver/nfs_nfsdstate.c
@@ -2336,12 +2336,13 @@
 APPLESTATIC int
 nfsrv_opencheck(nfsquad_t clientid, nfsv4stateid_t *stateidp,
     struct nfsstate *new_stp, vnode_t vp, struct nfsrv_descript *nd,
-    NFSPROC_T *p, int repstat)
+    int repstat)
 {
 	struct nfsstate *stp, *nstp;
 	struct nfsclient *clp;
 	struct nfsstate *ownerstp;
 	struct nfslockfile *lfp, *new_lfp;
+	struct thread *p = curthread;
 	int error = 0, haslock = 0, ret, readonly = 0, getfhret = 0;
 
 	if ((new_stp->ls_flags & NFSLCK_SHAREBITS) == NFSLCK_READACCESS)