diff options
Diffstat (limited to 'net/sunrpc/sched.c')
-rw-r--r-- | net/sunrpc/sched.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index fc083f0b3544..13ab0c6fed01 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c | |||
@@ -625,7 +625,7 @@ void rpc_release_calldata(const struct rpc_call_ops *ops, void *calldata) | |||
625 | /* | 625 | /* |
626 | * This is the RPC `scheduler' (or rather, the finite state machine). | 626 | * This is the RPC `scheduler' (or rather, the finite state machine). |
627 | */ | 627 | */ |
628 | static int __rpc_execute(struct rpc_task *task) | 628 | static void __rpc_execute(struct rpc_task *task) |
629 | { | 629 | { |
630 | int status = 0; | 630 | int status = 0; |
631 | 631 | ||
@@ -679,9 +679,9 @@ static int __rpc_execute(struct rpc_task *task) | |||
679 | if (RPC_IS_ASYNC(task)) { | 679 | if (RPC_IS_ASYNC(task)) { |
680 | /* Careful! we may have raced... */ | 680 | /* Careful! we may have raced... */ |
681 | if (RPC_IS_QUEUED(task)) | 681 | if (RPC_IS_QUEUED(task)) |
682 | return 0; | 682 | return; |
683 | if (rpc_test_and_set_running(task)) | 683 | if (rpc_test_and_set_running(task)) |
684 | return 0; | 684 | return; |
685 | continue; | 685 | continue; |
686 | } | 686 | } |
687 | 687 | ||
@@ -710,7 +710,6 @@ static int __rpc_execute(struct rpc_task *task) | |||
710 | dprintk("RPC: %4d, return %d, status %d\n", task->tk_pid, status, task->tk_status); | 710 | dprintk("RPC: %4d, return %d, status %d\n", task->tk_pid, status, task->tk_status); |
711 | /* Release all resources associated with the task */ | 711 | /* Release all resources associated with the task */ |
712 | rpc_release_task(task); | 712 | rpc_release_task(task); |
713 | return status; | ||
714 | } | 713 | } |
715 | 714 | ||
716 | /* | 715 | /* |
@@ -722,12 +721,11 @@ static int __rpc_execute(struct rpc_task *task) | |||
722 | * released. In particular note that tk_release() will have | 721 | * released. In particular note that tk_release() will have |
723 | * been called, so your task memory may have been freed. | 722 | * been called, so your task memory may have been freed. |
724 | */ | 723 | */ |
725 | int | 724 | void rpc_execute(struct rpc_task *task) |
726 | rpc_execute(struct rpc_task *task) | ||
727 | { | 725 | { |
728 | rpc_set_active(task); | 726 | rpc_set_active(task); |
729 | rpc_set_running(task); | 727 | rpc_set_running(task); |
730 | return __rpc_execute(task); | 728 | __rpc_execute(task); |
731 | } | 729 | } |
732 | 730 | ||
733 | static void rpc_async_schedule(struct work_struct *work) | 731 | static void rpc_async_schedule(struct work_struct *work) |