diff options
| author | Trond Myklebust | 2007-10-26 00:32:34 +0200 |
|---|---|---|
| committer | Trond Myklebust | 2008-01-30 08:05:31 +0100 |
| commit | b3ef8b3bb93300e58a4c4806207de3de4eb76f48 (patch) | |
| tree | d02db9d538477b5a98abcb7945dbf81fa9b8e4ec /net/sunrpc/clnt.c | |
| parent | SUNRPC: Add a helper rpc_call_start() that initialises task->tk_action (diff) | |
| download | kernel-qcow2-linux-b3ef8b3bb93300e58a4c4806207de3de4eb76f48.tar.gz kernel-qcow2-linux-b3ef8b3bb93300e58a4c4806207de3de4eb76f48.tar.xz kernel-qcow2-linux-b3ef8b3bb93300e58a4c4806207de3de4eb76f48.zip | |
SUNRPC: Allow rpc_init_task() to initialise the rpc_task->tk_msg
In preparation for the removal of rpc_call_setup().
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc/clnt.c')
| -rw-r--r-- | net/sunrpc/clnt.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 7aeffeebf42d..6eb79c49c937 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -540,13 +540,10 @@ struct rpc_task *rpc_run_task(const struct rpc_task_setup *task_setup_data) goto out; } - if (task_setup_data->rpc_message != NULL) { - rpc_call_setup(task, task_setup_data->rpc_message, 0); - if (task->tk_status != 0) { - ret = ERR_PTR(task->tk_status); - rpc_put_task(task); - goto out; - } + if (task->tk_status != 0) { + ret = ERR_PTR(task->tk_status); + rpc_put_task(task); + goto out; } atomic_inc(&task->tk_count); /* Mask signals on synchronous RPC calls and RPCSEC_GSS upcalls */ |