[PATCH] NFS4: Retry destroy session when getting -NFS4ERR_DELAY

[Kinglong Mee <kinglongmee@xxxxxxxxx>]

When umounting a client, it cost near ten seconds.
Dump the request, got
   client                     server
DELEGRETURN              ---->
DESTROY_SESSION          ----> 
          NFS4ERR_DELAY  <----  DESTROY_SESSION reply
                NFS4_OK  <----  DELEGRETURN reply
DESTROY_CLIENTID          ---->
  NFS4ERR_CLIENTID_BUSY  <----  DESTROY_CLIENTID reply
DESTROY_CLIENTID          ---->
  NFS4ERR_CLIENTID_BUSY  <----  DESTROY_CLIENTID reply
         ... ....                  ... ... 
There are ten DESTROY_CLIENTID requests.
This patch retry DESTROY_SESSION when getting NFS4ERR_DELAY,
try the best to destroy the session as destroy clientid.

With this patch, only cost more than 1 seconds, as,
   client                     server
DELEGRETURN          ---->
DESTROY_SESSION      ----> 
     NFS4ERR_DELAY  <----  DESTROY_SESSION reply
           NFS4_OK  <----  DELEGRETURN reply
DESTROY_SESSION      ----> 
           NFS4_OK  <----  DESTROY_SESSION reply
DESTROY_CLIENTID     ---->
           NFS4_OK  <----  DESTROY_CLIENTID reply

Signed-off-by: Kinglong Mee <kinglongmee@xxxxxxxxx>
---
 fs/nfs/nfs4proc.c | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 627f37c..2631dc2 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -7320,7 +7320,7 @@ out:
  * Issue the over-the-wire RPC DESTROY_SESSION.
  * The caller must serialize access to this routine.
  */
-int nfs4_proc_destroy_session(struct nfs4_session *session,
+static int _nfs4_proc_destroy_session(struct nfs4_session *session,
 		struct rpc_cred *cred)
 {
 	struct rpc_message msg = {
@@ -7332,10 +7332,6 @@ int nfs4_proc_destroy_session(struct nfs4_session *session,
 
 	dprintk("--> nfs4_proc_destroy_session\n");
 
-	/* session is still being setup */
-	if (!test_and_clear_bit(NFS4_SESSION_ESTABLISHED, &session->session_state))
-		return 0;
-
 	status = rpc_call_sync(session->clp->cl_rpcclient, &msg, RPC_TASK_TIMEOUT);
 	trace_nfs4_destroy_session(session->clp, status);
 
@@ -7347,6 +7343,26 @@ int nfs4_proc_destroy_session(struct nfs4_session *session,
 	return status;
 }
 
+int nfs4_proc_destroy_session(struct nfs4_session *session,
+		struct rpc_cred *cred)
+{
+	unsigned int loop;
+	int ret;
+
+	/* session is still being setup */
+	if (!test_and_clear_bit(NFS4_SESSION_ESTABLISHED, &session->session_state))
+		return 0;
+
+	for (loop = NFS4_MAX_LOOP_ON_RECOVER; loop != 0; loop--) {
+		ret = _nfs4_proc_destroy_session(session, cred);
+		if (ret != -NFS4ERR_DELAY)
+			break;
+		ssleep(1);
+	}
+
+	return ret;
+}
+
 /*
  * Renew the cl_session lease.
  */
-- 
2.3.3

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html