Page MenuHomeFreeBSD
Files F163354302

D19417.id54577.diff
No OneTemporary
Actions

D19417.id54577.diff
View Options

Index: sys/fs/nfs/nfs_var.h
===================================================================
--- sys/fs/nfs/nfs_var.h
+++ 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: sys/fs/nfsserver/nfs_nfsdkrpc.c
===================================================================
--- sys/fs/nfsserver/nfs_nfsdkrpc.c
+++ 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: sys/fs/nfsserver/nfs_nfsdsocket.c
===================================================================
--- sys/fs/nfsserver/nfs_nfsdsocket.c
+++ sys/fs/nfsserver/nfs_nfsdsocket.c
@@ -475,13 +475,16 @@
*/
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

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 23, 10:55 AM (6 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35399544
Default Alt Text
D19417.id54577.diff (1 KB)

Event Timeline