SUNRPC: Don't disconnect more than once if retransmitting NFSv4 requests

NFSv4 requires us to ensure that we break the TCP connection before we're
allowed to retransmit a request. However in the case where we're
retransmitting several requests that have been sent on the same
connection, we need to ensure that we don't interfere with the attempt to
reconnect and/or break the connection again once it has been established.

We therefore introduce a 'connection' cookie that is bumped every time a
connection is broken. This allows requests to track if they need to force a
disconnection.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 3ae560464513..8773b4342c92 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -1120,7 +1120,8 @@ call_status(struct rpc_task *task)
         case -ETIMEDOUT:
                 task->tk_action = call_timeout;
                 if (task->tk_client->cl_discrtry)
-                        xprt_force_disconnect(task->tk_xprt);
+                        xprt_conditional_disconnect(task->tk_xprt,
+                                        req->rq_connect_cookie);
                 break;
         case -ECONNREFUSED:
         case -ENOTCONN:
@@ -1245,7 +1246,8 @@ out_retry:
         if (task->tk_rqstp == req) {
                 req->rq_received = req->rq_rcv_buf.len = 0;
                 if (task->tk_client->cl_discrtry)
-                        xprt_force_disconnect(task->tk_xprt);
+                        xprt_conditional_disconnect(task->tk_xprt,
+                                        req->rq_connect_cookie);
         }
 }