diff options
-rw-r--r-- | include/linux/sunrpc/clnt.h | 4 | ||||
-rw-r--r-- | net/sunrpc/clnt.c | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h index 8ed9642a5a76..debe75532199 100644 --- a/include/linux/sunrpc/clnt.h +++ b/include/linux/sunrpc/clnt.h | |||
@@ -148,8 +148,8 @@ int rpc_call_sync(struct rpc_clnt *clnt, | |||
148 | const struct rpc_message *msg, int flags); | 148 | const struct rpc_message *msg, int flags); |
149 | struct rpc_task *rpc_call_null(struct rpc_clnt *clnt, struct rpc_cred *cred, | 149 | struct rpc_task *rpc_call_null(struct rpc_clnt *clnt, struct rpc_cred *cred, |
150 | int flags); | 150 | int flags); |
151 | void rpc_restart_call_prepare(struct rpc_task *); | 151 | int rpc_restart_call_prepare(struct rpc_task *); |
152 | void rpc_restart_call(struct rpc_task *); | 152 | int rpc_restart_call(struct rpc_task *); |
153 | void rpc_setbufsize(struct rpc_clnt *, unsigned int, unsigned int); | 153 | void rpc_setbufsize(struct rpc_clnt *, unsigned int, unsigned int); |
154 | size_t rpc_max_payload(struct rpc_clnt *); | 154 | size_t rpc_max_payload(struct rpc_clnt *); |
155 | void rpc_force_rebind(struct rpc_clnt *); | 155 | void rpc_force_rebind(struct rpc_clnt *); |
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 756fc324db9e..234c40c15f69 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c | |||
@@ -756,12 +756,13 @@ EXPORT_SYMBOL_GPL(rpc_force_rebind); | |||
756 | * Restart an (async) RPC call from the call_prepare state. | 756 | * Restart an (async) RPC call from the call_prepare state. |
757 | * Usually called from within the exit handler. | 757 | * Usually called from within the exit handler. |
758 | */ | 758 | */ |
759 | void | 759 | int |
760 | rpc_restart_call_prepare(struct rpc_task *task) | 760 | rpc_restart_call_prepare(struct rpc_task *task) |
761 | { | 761 | { |
762 | if (RPC_ASSASSINATED(task)) | 762 | if (RPC_ASSASSINATED(task)) |
763 | return; | 763 | return 0; |
764 | task->tk_action = rpc_prepare_task; | 764 | task->tk_action = rpc_prepare_task; |
765 | return 1; | ||
765 | } | 766 | } |
766 | EXPORT_SYMBOL_GPL(rpc_restart_call_prepare); | 767 | EXPORT_SYMBOL_GPL(rpc_restart_call_prepare); |
767 | 768 | ||
@@ -769,13 +770,13 @@ EXPORT_SYMBOL_GPL(rpc_restart_call_prepare); | |||
769 | * Restart an (async) RPC call. Usually called from within the | 770 | * Restart an (async) RPC call. Usually called from within the |
770 | * exit handler. | 771 | * exit handler. |
771 | */ | 772 | */ |
772 | void | 773 | int |
773 | rpc_restart_call(struct rpc_task *task) | 774 | rpc_restart_call(struct rpc_task *task) |
774 | { | 775 | { |
775 | if (RPC_ASSASSINATED(task)) | 776 | if (RPC_ASSASSINATED(task)) |
776 | return; | 777 | return 0; |
777 | |||
778 | task->tk_action = call_start; | 778 | task->tk_action = call_start; |
779 | return 1; | ||
779 | } | 780 | } |
780 | EXPORT_SYMBOL_GPL(rpc_restart_call); | 781 | EXPORT_SYMBOL_GPL(rpc_restart_call); |
781 | 782 | ||