Page MenuHomeFreeBSD
Files F147163607

D19455.id.diff
No OneTemporary
Actions

D19455.id.diff
View Options

Index: head/sys/fs/nfs/nfs_commonsubs.c
===================================================================
--- head/sys/fs/nfs/nfs_commonsubs.c
+++ head/sys/fs/nfs/nfs_commonsubs.c
@@ -198,8 +198,7 @@
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 @@
}
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 @@
}
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 @@
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 @@
}
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 @@
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 @@
* 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;

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 9, 6:39 PM (2 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29453031
Default Alt Text
D19455.id.diff (2 KB)

Event Timeline