SUNRPC: Refactor xprt_request_wait_receive()

Convert the transport callback to actually put the request to sleep
instead of just setting a timeout. This is in preparation for
rpc_sleep_on_timeout().

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 732d4b57411a..b4b4b8db143c 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -2690,7 +2690,7 @@ static const struct rpc_xprt_ops xs_local_ops = {
         .buf_free               = rpc_free,
         .prepare_request        = xs_stream_prepare_request,
         .send_request           = xs_local_send_request,
-        .set_retrans_timeout    = xprt_set_retrans_timeout_def,
+        .wait_for_reply_request = xprt_wait_for_reply_request_def,
         .close                  = xs_close,
         .destroy                = xs_destroy,
         .print_stats            = xs_local_print_stats,
@@ -2710,7 +2710,7 @@ static const struct rpc_xprt_ops xs_udp_ops = {
         .buf_alloc              = rpc_malloc,
         .buf_free               = rpc_free,
         .send_request           = xs_udp_send_request,
-        .set_retrans_timeout    = xprt_set_retrans_timeout_rtt,
+        .wait_for_reply_request = xprt_wait_for_reply_request_rtt,
         .timer                  = xs_udp_timer,
         .release_request        = xprt_release_rqst_cong,
         .close                  = xs_close,
@@ -2733,7 +2733,7 @@ static const struct rpc_xprt_ops xs_tcp_ops = {
         .buf_free               = rpc_free,
         .prepare_request        = xs_stream_prepare_request,
         .send_request           = xs_tcp_send_request,
-        .set_retrans_timeout    = xprt_set_retrans_timeout_def,
+        .wait_for_reply_request = xprt_wait_for_reply_request_def,
         .close                  = xs_tcp_shutdown,
         .destroy                = xs_destroy,
         .set_connect_timeout    = xs_tcp_set_connect_timeout,
@@ -2761,7 +2761,7 @@ static const struct rpc_xprt_ops bc_tcp_ops = {
         .buf_alloc              = bc_malloc,
         .buf_free               = bc_free,
         .send_request           = bc_send_request,
-        .set_retrans_timeout    = xprt_set_retrans_timeout_def,
+        .wait_for_reply_request = xprt_wait_for_reply_request_def,
         .close                  = bc_close,
         .destroy                = bc_destroy,
         .print_stats            = xs_tcp_print_stats,