Author: trasz
Date: Tue Mar 12 15:02:52 2019
New Revision: 345063
URL: https://svnweb.freebsd.org/changeset/base/345063
Log:
Drop unused 'p' argument to nfsv4_strtouid().
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 14:59:08 2019
(r345062)
+++ head/sys/fs/nfs/nfs_commonacl.c Tue Mar 12 15:02:52 2019
(r345063)
@@ -108,7 +108,7 @@ nfsrv_dissectace(struct nfsrv_descript *nd, struct acl
acep->ae_id = (uid_t)gid;
} else {
acep->ae_tag = ACL_USER;
- aceerr = nfsv4_strtouid(nd, name, len, &uid, p);
+ aceerr = nfsv4_strtouid(nd, name, len, &uid);
if (aceerr == 0)
acep->ae_id = uid;
}
Modified: head/sys/fs/nfs/nfs_commonsubs.c
==============================================================================
--- head/sys/fs/nfs/nfs_commonsubs.c Tue Mar 12 14:59:08 2019
(r345062)
+++ head/sys/fs/nfs/nfs_commonsubs.c Tue Mar 12 15:02:52 2019
(r345063)
@@ -1819,12 +1819,12 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp,
}
if (compare) {
if (!(*retcmpp)) {
- if (nfsv4_strtouid(nd, cp, j, &uid, p) ||
+ if (nfsv4_strtouid(nd, cp, j, &uid) ||
nap->na_uid != uid)
*retcmpp = NFSERR_NOTSAME;
}
} else if (nap != NULL) {
- if (nfsv4_strtouid(nd, cp, j, &uid, p))
+ if (nfsv4_strtouid(nd, cp, j, &uid))
nap->na_uid = nfsrv_defaultuid;
else
nap->na_uid = uid;
@@ -3165,8 +3165,7 @@ tryagain:
* a number.
*/
APPLESTATIC int
-nfsv4_strtouid(struct nfsrv_descript *nd, u_char *str, int len, uid_t *uidp,
- NFSPROC_T *p)
+nfsv4_strtouid(struct nfsrv_descript *nd, u_char *str, int len, uid_t *uidp)
{
int i;
char *cp, *endstr, *str0;
Modified: head/sys/fs/nfs/nfs_var.h
==============================================================================
--- head/sys/fs/nfs/nfs_var.h Tue Mar 12 14:59:08 2019 (r345062)
+++ head/sys/fs/nfs/nfs_var.h Tue Mar 12 15:02:52 2019 (r345063)
@@ -372,8 +372,7 @@ void nfsrv_adj(mbuf_t, int, int);
void nfsrv_postopattr(struct nfsrv_descript *, int, struct nfsvattr *);
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 *,
- NFSPROC_T *);
+int nfsv4_strtouid(struct nfsrv_descript *, u_char *, int, uid_t *);
void nfsv4_gidtostr(gid_t, u_char **, int *, NFSPROC_T *);
int nfsv4_strtogid(struct nfsrv_descript *, u_char *, int, gid_t *,
NFSPROC_T *);
Modified: head/sys/fs/nfsclient/nfs_clrpcops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clrpcops.c Tue Mar 12 14:59:08 2019
(r345062)
+++ head/sys/fs/nfsclient/nfs_clrpcops.c Tue Mar 12 15:02:52 2019
(r345063)
@@ -7029,7 +7029,7 @@ nfsrv_parseug(struct nfsrv_descript *nd, int dogrp, ui
if (dogrp != 0)
error = nfsv4_strtogid(nd, str, len, gidp, p);
else
- error = nfsv4_strtouid(nd, str, len, uidp, p);
+ error = nfsv4_strtouid(nd, str, len, uidp);
nfsmout:
if (len > NFSV4_SMALLSTR)
free(str, M_TEMP);
Modified: head/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdport.c Tue Mar 12 14:59:08 2019
(r345062)
+++ head/sys/fs/nfsserver/nfs_nfsdport.c Tue Mar 12 15:02:52 2019
(r345063)
@@ -2791,8 +2791,8 @@ nfsv4_sattr(struct nfsrv_descript *nd, vnode_t vp, str
goto nfsmout;
}
if (!nd->nd_repstat) {
- nd->nd_repstat = nfsv4_strtouid(nd, cp, j, &uid,
- p);
+ nd->nd_repstat = nfsv4_strtouid(nd, cp, j,
+ &uid);
if (!nd->nd_repstat)
nvap->na_uid = uid;
}
_______________________________________________
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"
