|
@@ -556,26 +556,16 @@ static const struct rpc_call_ops rpc_default_ops = {
|
|
|
*/
|
|
|
struct rpc_task *rpc_run_task(const struct rpc_task_setup *task_setup_data)
|
|
|
{
|
|
|
- struct rpc_task *task, *ret;
|
|
|
+ struct rpc_task *task;
|
|
|
|
|
|
task = rpc_new_task(task_setup_data);
|
|
|
- if (task == NULL) {
|
|
|
- rpc_release_calldata(task_setup_data->callback_ops,
|
|
|
- task_setup_data->callback_data);
|
|
|
- ret = ERR_PTR(-ENOMEM);
|
|
|
+ if (IS_ERR(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);
|
|
|
rpc_execute(task);
|
|
|
- ret = task;
|
|
|
out:
|
|
|
- return ret;
|
|
|
+ return task;
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(rpc_run_task);
|
|
|
|
|
@@ -657,9 +647,8 @@ struct rpc_task *rpc_run_bc_task(struct rpc_rqst *req,
|
|
|
* Create an rpc_task to send the data
|
|
|
*/
|
|
|
task = rpc_new_task(&task_setup_data);
|
|
|
- if (!task) {
|
|
|
+ if (IS_ERR(task)) {
|
|
|
xprt_free_bc_request(req);
|
|
|
- task = ERR_PTR(-ENOMEM);
|
|
|
goto out;
|
|
|
}
|
|
|
task->tk_rqstp = req;
|