diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
| commit | d3e71cb08747743fce908122bab08b479eb403a5 (patch) | |
| tree | cbec6948fdbdee9af81cf3ecfb504070d2745d7b /fs/lockd | |
| parent | fe7ff1706e323d0e5ed83972960a1ecc1ee538b3 (diff) | |
Merge with Linux 2.3.99-pre3.
Diffstat (limited to 'fs/lockd')
| -rw-r--r-- | fs/lockd/clntproc.c | 8 | ||||
| -rw-r--r-- | fs/lockd/mon.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c index 517456326..20b9bb490 100644 --- a/fs/lockd/clntproc.c +++ b/fs/lockd/clntproc.c @@ -296,6 +296,7 @@ nlmclnt_async_call(struct nlm_rqst *req, u32 proc, rpc_action callback) struct rpc_clnt *clnt; struct nlm_args *argp = &req->a_args; struct nlm_res *resp = &req->a_res; + struct rpc_message msg; int status; dprintk("lockd: call procedure %s on %s (async)\n", @@ -306,8 +307,11 @@ nlmclnt_async_call(struct nlm_rqst *req, u32 proc, rpc_action callback) return -ENOLCK; /* bootstrap and kick off the async RPC call */ - status = rpc_do_call(clnt, proc, argp, resp, RPC_TASK_ASYNC, - callback, req); + msg.rpc_proc = proc; + msg.rpc_argp = argp; + msg.rpc_resp =resp; + msg.rpc_cred = NULL; + status = rpc_call_async(clnt, &msg, RPC_TASK_ASYNC, callback, req); /* If the async call is proceeding, increment host refcount */ if (status >= 0 && (req->a_flags & RPC_TASK_ASYNC)) diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c index a2f280bdc..55dee3886 100644 --- a/fs/lockd/mon.c +++ b/fs/lockd/mon.c @@ -163,7 +163,7 @@ xdr_encode_mon(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp) *p++ = htonl(argp->proc); /* This is the private part. Needed only for SM_MON call */ - if (rqstp->rq_task->tk_proc == SM_MON) { + if (rqstp->rq_task->tk_msg.rpc_proc == SM_MON) { *p++ = argp->addr; *p++ = 0; *p++ = 0; |