Page MenuHomeFreeBSD
Files F147035549

D19417.diff
No OneTemporary
Actions

D19417.diff
View Options

Index: head/sys/fs/nfs/nfs_var.h
===================================================================
--- head/sys/fs/nfs/nfs_var.h
+++ head/sys/fs/nfs/nfs_var.h
@@ -283,8 +283,7 @@
/* nfs_nfsdsocket.c */
void nfsrvd_rephead(struct nfsrv_descript *);
-void nfsrvd_dorpc(struct nfsrv_descript *, int, u_char *, int, u_int32_t,
- NFSPROC_T *);
+void nfsrvd_dorpc(struct nfsrv_descript *, int, u_char *, int, u_int32_t);
/* nfs_nfsdcache.c */
void nfsrvd_initcache(void);
Index: head/sys/fs/nfsserver/nfs_nfsdkrpc.c
===================================================================
--- head/sys/fs/nfsserver/nfs_nfsdkrpc.c
+++ head/sys/fs/nfsserver/nfs_nfsdkrpc.c
@@ -323,7 +323,6 @@
nfs_proc(struct nfsrv_descript *nd, u_int32_t xid, SVCXPRT *xprt,
struct nfsrvcache **rpp)
{
- struct thread *td = curthread;
int cacherep = RC_DOIT, isdgram, taglen = -1;
struct mbuf *m;
u_char tag[NFSV4_SMALLSTR + 1], *tagstr = NULL;
@@ -384,7 +383,7 @@
if (cacherep == RC_DOIT) {
if ((nd->nd_flag & ND_NFSV41) != 0)
nd->nd_xprt = xprt;
- nfsrvd_dorpc(nd, isdgram, tagstr, taglen, minorvers, td);
+ nfsrvd_dorpc(nd, isdgram, tagstr, taglen, minorvers);
if ((nd->nd_flag & ND_NFSV41) != 0) {
if (nd->nd_repstat != NFSERR_REPLYFROMCACHE &&
(nd->nd_flag & ND_SAVEREPLY) != 0) {
Index: head/sys/fs/nfsserver/nfs_nfsdsocket.c
===================================================================
--- head/sys/fs/nfsserver/nfs_nfsdsocket.c
+++ head/sys/fs/nfsserver/nfs_nfsdsocket.c
@@ -367,7 +367,7 @@
/* local functions */
static void nfsrvd_compound(struct nfsrv_descript *nd, int isdgram,
- u_char *tag, int taglen, u_int32_t minorvers, NFSPROC_T *p);
+ u_char *tag, int taglen, u_int32_t minorvers);
/*
@@ -475,14 +475,17 @@
*/
APPLESTATIC void
nfsrvd_dorpc(struct nfsrv_descript *nd, int isdgram, u_char *tag, int taglen,
- u_int32_t minorvers, NFSPROC_T *p)
+ u_int32_t minorvers)
{
int error = 0, lktype;
vnode_t vp;
mount_t mp = NULL;
struct nfsrvfh fh;
struct nfsexstuff nes;
+ struct thread *p;
+ p = curthread;
+
/*
* Get a locked vnode for the first file handle
*/
@@ -557,7 +560,7 @@
* The group is indicated by the value in nfs_retfh[].
*/
if (nd->nd_flag & ND_NFSV4) {
- nfsrvd_compound(nd, isdgram, tag, taglen, minorvers, p);
+ nfsrvd_compound(nd, isdgram, tag, taglen, minorvers);
} else {
struct bintime start_time;
@@ -620,7 +623,7 @@
*/
static void
nfsrvd_compound(struct nfsrv_descript *nd, int isdgram, u_char *tag,
- int taglen, u_int32_t minorvers, NFSPROC_T *p)
+ int taglen, u_int32_t minorvers)
{
int i, lktype, op, op0 = 0, statsinprog = 0;
u_int32_t *tl;
@@ -635,6 +638,9 @@
fsid_t cur_fsid, save_fsid;
static u_int64_t compref = 0;
struct bintime start_time;
+ struct thread *p;
+
+ p = curthread;
NFSVNO_EXINIT(&vpnes);
NFSVNO_EXINIT(&savevpnes);

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 8, 7:22 PM (11 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29414416
Default Alt Text
D19417.diff (2 KB)

Event Timeline