From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Fri, 18 Sep 2015 13:52:07 +0000 (-0400)
Subject: SUNRPC: xs_sock_mark_closed() does not need to trigger socket autoclose
X-Git-Tag: v4.3-rc3~16^2~6
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4b0ab51db32eba0f48b7618254742f143364a28d;p=linux.git

SUNRPC: xs_sock_mark_closed() does not need to trigger socket autoclose

Under all conditions, it should be quite sufficient just to mark
the socket as disconnected. It will then be closed by the
transport shutdown or reconnect code.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index c35038511686..1a85e0ed0b48 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -777,7 +777,6 @@ static void xs_sock_mark_closed(struct rpc_xprt *xprt)
 	xs_sock_reset_connection_flags(xprt);
 	/* Mark transport as closed and wake up all pending tasks */
 	xprt_disconnect_done(xprt);
-	xprt_force_disconnect(xprt);
 }
 
 /**