d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop unused 'p' argument to nfsv4_strtogid().

Browse Source 
MFC after:	2 weeks
Sponsored by:	DARPA, AFRL
This commit is contained in:
Edward Tomasz Napierala 2019-03-12 15:07:47 +00:00
parent c703cba811
commit 2df8bd90c8
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/fs/nfs/nfs_commonacl.c
View File

@ -103,7 +103,7 @@ nfsrv_dissectace(struct nfsrv_descript *nd, struct acl_entry *acep,
if (gotid == 0) { if (gotid == 0) {
if (flag & NFSV4ACE_IDENTIFIERGROUP) { if (flag & NFSV4ACE_IDENTIFIERGROUP) {
acep->ae_tag = ACL_GROUP; acep->ae_tag = ACL_GROUP;
aceerr = nfsv4_strtogid(nd, name, len, &gid, p); aceerr = nfsv4_strtogid(nd, name, len, &gid);
if (aceerr == 0) if (aceerr == 0)
acep->ae_id = (uid_t)gid; acep->ae_id = (uid_t)gid;
} else { } else {

7
sys/fs/nfs/nfs_commonsubs.c
View File

@ -1852,12 +1852,12 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp,
} }
if (compare) { if (compare) {
if (!(*retcmpp)) { if (!(*retcmpp)) {
if (nfsv4_strtogid(nd, cp, j, &gid, p) || if (nfsv4_strtogid(nd, cp, j, &gid) ||
nap->na_gid != gid) nap->na_gid != gid)
*retcmpp = NFSERR_NOTSAME; *retcmpp = NFSERR_NOTSAME;
} }
} else if (nap != NULL) { } else if (nap != NULL) {
if (nfsv4_strtogid(nd, cp, j, &gid, p)) if (nfsv4_strtogid(nd, cp, j, &gid))
nap->na_gid = nfsrv_defaultgid; nap->na_gid = nfsrv_defaultgid;
else else
nap->na_gid = gid; nap->na_gid = gid;
@ -3379,8 +3379,7 @@ tryagain:
* a number. * a number.
*/ */
APPLESTATIC int APPLESTATIC int
nfsv4_strtogid(struct nfsrv_descript *nd, u_char *str, int len, gid_t *gidp, nfsv4_strtogid(struct nfsrv_descript *nd, u_char *str, int len, gid_t *gidp)
NFSPROC_T *p)
{ {
int i; int i;
char *cp, *endstr, *str0; char *cp, *endstr, *str0;

3
sys/fs/nfs/nfs_var.h
View File

@ -374,8 +374,7 @@ int nfsd_errmap(struct nfsrv_descript *);
void nfsv4_uidtostr(uid_t, u_char **, int *); void nfsv4_uidtostr(uid_t, u_char **, int *);
int nfsv4_strtouid(struct nfsrv_descript *, u_char *, int, uid_t *); int nfsv4_strtouid(struct nfsrv_descript *, u_char *, int, uid_t *);
void nfsv4_gidtostr(gid_t, u_char **, int *); void nfsv4_gidtostr(gid_t, u_char **, int *);
int nfsv4_strtogid(struct nfsrv_descript *, u_char *, int, gid_t *, int nfsv4_strtogid(struct nfsrv_descript *, u_char *, int, gid_t *);
NFSPROC_T *);
int nfsrv_checkuidgid(struct nfsrv_descript *, struct nfsvattr *); int nfsrv_checkuidgid(struct nfsrv_descript *, struct nfsvattr *);
void nfsrv_fixattr(struct nfsrv_descript *, vnode_t, void nfsrv_fixattr(struct nfsrv_descript *, vnode_t,
struct nfsvattr *, NFSACL_T *, NFSPROC_T *, nfsattrbit_t *, struct nfsvattr *, NFSACL_T *, NFSPROC_T *, nfsattrbit_t *,

2
sys/fs/nfsclient/nfs_clrpcops.c
View File

@ -7027,7 +7027,7 @@ nfsrv_parseug(struct nfsrv_descript *nd, int dogrp, uid_t *uidp, gid_t *gidp,
str[len] = '\0'; str[len] = '\0';
NFSCL_DEBUG(4, "nfsrv_parseug: str=%s\n", str); NFSCL_DEBUG(4, "nfsrv_parseug: str=%s\n", str);
if (dogrp != 0) if (dogrp != 0)
error = nfsv4_strtogid(nd, str, len, gidp, p); error = nfsv4_strtogid(nd, str, len, gidp);
else else
error = nfsv4_strtouid(nd, str, len, uidp); error = nfsv4_strtouid(nd, str, len, uidp);
nfsmout: nfsmout:

4
sys/fs/nfsserver/nfs_nfsdport.c
View File

@ -2818,8 +2818,8 @@ nfsv4_sattr(struct nfsrv_descript *nd, vnode_t vp, struct nfsvattr *nvap,
goto nfsmout; goto nfsmout;
} }
if (!nd->nd_repstat) { if (!nd->nd_repstat) {
nd->nd_repstat = nfsv4_strtogid(nd, cp, j, &gid, nd->nd_repstat = nfsv4_strtogid(nd, cp, j,
p); &gid);
if (!nd->nd_repstat) if (!nd->nd_repstat)
nvap->na_gid = gid; nvap->na_gid = gid;
} }