svn commit: r345061 - head/sys/fs/nfs
Edward Tomasz Napierala
trasz at FreeBSD.org
Tue Mar 12 14:53:54 UTC 2019
Author: trasz
Date: Tue Mar 12 14:53:53 2019
New Revision: 345061
URL: https://svnweb.freebsd.org/changeset/base/345061
Log:
Drop unused 'p' argument to nfsrv_getuser().
Reviewed by: rmacklem
MFC after: 2 weeks
Sponsored by: DARPA, AFRL
Differential Revision: https://reviews.freebsd.org/D19455
Modified:
head/sys/fs/nfs/nfs_commonsubs.c
Modified: head/sys/fs/nfs/nfs_commonsubs.c
==============================================================================
--- head/sys/fs/nfs/nfs_commonsubs.c Tue Mar 12 09:43:11 2019 (r345060)
+++ head/sys/fs/nfs/nfs_commonsubs.c Tue Mar 12 14:53:53 2019 (r345061)
@@ -198,8 +198,7 @@ static int nfs_bigreply[NFSV41_NPROCS] = { 0, 0, 0, 1,
static int nfsrv_skipace(struct nfsrv_descript *nd, int *acesizep);
static void nfsv4_wanted(struct nfsv4lock *lp);
static int nfsrv_cmpmixedcase(u_char *cp, u_char *cp2, int len);
-static int nfsrv_getuser(int procnum, uid_t uid, gid_t gid, char *name,
- NFSPROC_T *p);
+static int nfsrv_getuser(int procnum, uid_t uid, gid_t gid, char *name);
static void nfsrv_removeuser(struct nfsusrgrp *usrp, int isuser);
static int nfsrv_getrefstr(struct nfsrv_descript *, u_char **, u_char **,
int *, int *);
@@ -3087,8 +3086,7 @@ tryagain:
}
mtx_unlock(&hp->mtx);
cnt++;
- ret = nfsrv_getuser(RPCNFSUSERD_GETUID, uid, (gid_t)0,
- NULL, p);
+ ret = nfsrv_getuser(RPCNFSUSERD_GETUID, uid, (gid_t)0, NULL);
if (ret == 0 && cnt < 2)
goto tryagain;
}
@@ -3151,8 +3149,7 @@ tryagain:
}
mtx_unlock(&hp->mtx);
cnt++;
- ret = nfsrv_getuser(RPCNFSUSERD_GETUID, uid, (gid_t)0,
- NULL, curthread);
+ ret = nfsrv_getuser(RPCNFSUSERD_GETUID, uid, (gid_t)0, NULL);
if (ret == 0 && cnt < 2)
goto tryagain;
}
@@ -3252,7 +3249,7 @@ tryagain:
mtx_unlock(&hp->mtx);
cnt++;
ret = nfsrv_getuser(RPCNFSUSERD_GETUSER, (uid_t)0, (gid_t)0,
- str, p);
+ str);
if (ret == 0 && cnt < 2)
goto tryagain;
}
@@ -3349,8 +3346,7 @@ tryagain:
}
mtx_unlock(&hp->mtx);
cnt++;
- ret = nfsrv_getuser(RPCNFSUSERD_GETGID, (uid_t)0, gid,
- NULL, p);
+ ret = nfsrv_getuser(RPCNFSUSERD_GETGID, (uid_t)0, gid, NULL);
if (ret == 0 && cnt < 2)
goto tryagain;
}
@@ -3466,7 +3462,7 @@ tryagain:
mtx_unlock(&hp->mtx);
cnt++;
ret = nfsrv_getuser(RPCNFSUSERD_GETGROUP, (uid_t)0, (gid_t)0,
- str, p);
+ str);
if (ret == 0 && cnt < 2)
goto tryagain;
}
@@ -3585,7 +3581,7 @@ nfsrv_nfsuserddelport(void)
* Returns 0 upon success, non-zero otherwise.
*/
static int
-nfsrv_getuser(int procnum, uid_t uid, gid_t gid, char *name, NFSPROC_T *p)
+nfsrv_getuser(int procnum, uid_t uid, gid_t gid, char *name)
{
u_int32_t *tl;
struct nfsrv_descript *nd;
More information about the svn-src-head
mailing list