From 21fecb2386b1df015a2cb6c67f511c8ef5f2e3ca Mon Sep 17 00:00:00 2001
From: trasz <trasz@FreeBSD.org>
Date: Tue, 12 Mar 2019 15:07:47 +0000
Subject: [PATCH] Drop unused 'p' argument to nfsv4_strtogid().

MFC after:	2 weeks
Sponsored by:	DARPA, AFRL
---
 sys/fs/nfs/nfs_commonacl.c      | 2 +-
 sys/fs/nfs/nfs_commonsubs.c     | 7 +++----
 sys/fs/nfs/nfs_var.h            | 3 +--
 sys/fs/nfsclient/nfs_clrpcops.c | 2 +-
 sys/fs/nfsserver/nfs_nfsdport.c | 4 ++--
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/sys/fs/nfs/nfs_commonacl.c b/sys/fs/nfs/nfs_commonacl.c
index 6a5157eada19..7134db368a3d 100644
--- a/sys/fs/nfs/nfs_commonacl.c
+++ b/sys/fs/nfs/nfs_commonacl.c
@@ -103,7 +103,7 @@ nfsrv_dissectace(struct nfsrv_descript *nd, struct acl_entry *acep,
 	if (gotid == 0) {
 		if (flag & NFSV4ACE_IDENTIFIERGROUP) {
 			acep->ae_tag = ACL_GROUP;
-			aceerr = nfsv4_strtogid(nd, name, len, &gid, p);
+			aceerr = nfsv4_strtogid(nd, name, len, &gid);
 			if (aceerr == 0)
 				acep->ae_id = (uid_t)gid;
 		} else {
diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c
index 93ee60af749f..3f5982497b2e 100644
--- a/sys/fs/nfs/nfs_commonsubs.c
+++ b/sys/fs/nfs/nfs_commonsubs.c
@@ -1852,12 +1852,12 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp,
 			}
 			if (compare) {
 			    if (!(*retcmpp)) {
-				if (nfsv4_strtogid(nd, cp, j, &gid, p) ||
+				if (nfsv4_strtogid(nd, cp, j, &gid) ||
 				    nap->na_gid != gid)
 				    *retcmpp = NFSERR_NOTSAME;
 			    }
 			} else if (nap != NULL) {
-				if (nfsv4_strtogid(nd, cp, j, &gid, p))
+				if (nfsv4_strtogid(nd, cp, j, &gid))
 					nap->na_gid = nfsrv_defaultgid;
 				else
 					nap->na_gid = gid;
@@ -3379,8 +3379,7 @@ nfsv4_gidtostr(gid_t gid, u_char **cpp, int *retlenp)
  * a number.
  */
 APPLESTATIC int
-nfsv4_strtogid(struct nfsrv_descript *nd, u_char *str, int len, gid_t *gidp,
-    NFSPROC_T *p)
+nfsv4_strtogid(struct nfsrv_descript *nd, u_char *str, int len, gid_t *gidp)
 {
 	int i;
 	char *cp, *endstr, *str0;
diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h
index ff0b694e14ee..d2d52377e8c1 100644
--- a/sys/fs/nfs/nfs_var.h
+++ b/sys/fs/nfs/nfs_var.h
@@ -374,8 +374,7 @@ int nfsd_errmap(struct nfsrv_descript *);
 void nfsv4_uidtostr(uid_t, u_char **, int *);
 int nfsv4_strtouid(struct nfsrv_descript *, u_char *, int, uid_t *);
 void nfsv4_gidtostr(gid_t, u_char **, int *);
-int nfsv4_strtogid(struct nfsrv_descript *, u_char *, int, gid_t *,
-    NFSPROC_T *);
+int nfsv4_strtogid(struct nfsrv_descript *, u_char *, int, gid_t *);
 int nfsrv_checkuidgid(struct nfsrv_descript *, struct nfsvattr *);
 void nfsrv_fixattr(struct nfsrv_descript *, vnode_t,
     struct nfsvattr *, NFSACL_T *, NFSPROC_T *, nfsattrbit_t *,
diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c
index bacab3e6ba4f..7a15719717ad 100644
--- a/sys/fs/nfsclient/nfs_clrpcops.c
+++ b/sys/fs/nfsclient/nfs_clrpcops.c
@@ -7027,7 +7027,7 @@ nfsrv_parseug(struct nfsrv_descript *nd, int dogrp, uid_t *uidp, gid_t *gidp,
 	str[len] = '\0';
 	NFSCL_DEBUG(4, "nfsrv_parseug: str=%s\n", str);
 	if (dogrp != 0)
-		error = nfsv4_strtogid(nd, str, len, gidp, p);
+		error = nfsv4_strtogid(nd, str, len, gidp);
 	else
 		error = nfsv4_strtouid(nd, str, len, uidp);
 nfsmout:
diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c
index 63d4ab53bb6d..65f0caf56e5e 100644
--- a/sys/fs/nfsserver/nfs_nfsdport.c
+++ b/sys/fs/nfsserver/nfs_nfsdport.c
@@ -2818,8 +2818,8 @@ nfsv4_sattr(struct nfsrv_descript *nd, vnode_t vp, struct nfsvattr *nvap,
 				goto nfsmout;
 			}
 			if (!nd->nd_repstat) {
-				nd->nd_repstat = nfsv4_strtogid(nd, cp, j, &gid,
-				    p);
+				nd->nd_repstat = nfsv4_strtogid(nd, cp, j,
+				    &gid);
 				if (!nd->nd_repstat)
 					nvap->na_gid = gid;
 			}