Skip to content

Commit

Permalink
RPC: clarify rpc_run_task error handling
Browse files Browse the repository at this point in the history
rpc_run_task can only fail if it is not passed in a preallocated task.
However, that is not at all clear with the current code.  So
remove several impossible to occur failure checks.

Signed-off-by: Fred Isaman <iisaman@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
Fred Isaman authored and Trond Myklebust committed Mar 11, 2011
1 parent cee6a53 commit eabf5ba
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
6 changes: 0 additions & 6 deletions net/sunrpc/clnt.c
Original file line number Diff line number Diff line change
Expand Up @@ -636,12 +636,6 @@ struct rpc_task *rpc_run_task(const struct rpc_task_setup *task_setup_data)
rpc_task_set_client(task, task_setup_data->rpc_client);
rpc_task_set_rpc_message(task, task_setup_data->rpc_message);

if (task->tk_status != 0) {
int ret = task->tk_status;
rpc_put_task(task);
return ERR_PTR(ret);
}

if (task->tk_action == NULL)
rpc_call_start(task);

Expand Down
6 changes: 0 additions & 6 deletions net/sunrpc/sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -836,12 +836,6 @@ struct rpc_task *rpc_new_task(const struct rpc_task_setup *setup_data)
}

rpc_init_task(task, setup_data);
if (task->tk_status < 0) {
int err = task->tk_status;
rpc_put_task(task);
return ERR_PTR(err);
}

task->tk_flags |= flags;
dprintk("RPC: allocated task %p\n", task);
return task;
Expand Down

0 comments on commit eabf5ba

Please sign in to comment.