Author: trasz
Date: Tue Mar 12 15:07:47 2019
New Revision: 345065
URL: https://svnweb.freebsd.org/changeset/base/345065
Log:
Drop unused 'p' argument to nfsv4_strtogid().
MFC after: 2 weeks
Sponsored by: DARPA, AFRL
Modified:
head/sys/fs/nfs/nfs_commonacl.c
head/sys/fs/nfs/nfs_commonsubs.c
head/sys/fs/nfs/nfs_var.h
head/sys/fs/nfsclient/nfs_clrpcops.c
head/sys/fs/nfsserver/nfs_nfsdport.c
Modified: head/sys/fs/nfs/nfs_commonacl.c
==============================================================================
--- head/sys/fs/nfs/nfs_commonacl.c Tue Mar 12 15:05:11 2019
(r345064)
+++ head/sys/fs/nfs/nfs_commonacl.c Tue Mar 12 15:07:47 2019
(r345065)
@@ -103,7 +103,7 @@ nfsrv_dissectace(struct nfsrv_descript *nd, struct acl
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 {
Modified: head/sys/fs/nfs/nfs_commonsubs.c
==============================================================================
--- head/sys/fs/nfs/nfs_commonsubs.c Tue Mar 12 15:05:11 2019
(r345064)
+++ head/sys/fs/nfs/nfs_commonsubs.c Tue Mar 12 15:07:47 2019
(r345065)
@@ -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 @@ tryagain:
* 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;
Modified: head/sys/fs/nfs/nfs_var.h
==============================================================================
--- head/sys/fs/nfs/nfs_var.h Tue Mar 12 15:05:11 2019 (r345064)
+++ head/sys/fs/nfs/nfs_var.h Tue Mar 12 15:07:47 2019 (r345065)
@@ -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 *,
Modified: head/sys/fs/nfsclient/nfs_clrpcops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clrpcops.c Tue Mar 12 15:05:11 2019
(r345064)
+++ head/sys/fs/nfsclient/nfs_clrpcops.c Tue Mar 12 15:07:47 2019
(r345065)
@@ -7027,7 +7027,7 @@ nfsrv_parseug(struct nfsrv_descript *nd, int dogrp, ui
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:
Modified: head/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdport.c Tue Mar 12 15:05:11 2019
(r345064)
+++ head/sys/fs/nfsserver/nfs_nfsdport.c Tue Mar 12 15:07:47 2019
(r345065)
@@ -2818,8 +2818,8 @@ nfsv4_sattr(struct nfsrv_descript *nd, vnode_t vp, str
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;
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
