SUNRPC: xs_sock_mark_closed() does not need to trigger socket autoclose
authorTrond Myklebust <trond.myklebust@primarydata.com>
Fri, 18 Sep 2015 13:52:07 +0000 (09:52 -0400)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Sat, 19 Sep 2015 20:38:35 +0000 (16:38 -0400)
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>
net/sunrpc/xprtsock.c

index c35038511686ad53bb042b0135138f13b4ee18aa..1a85e0ed0b4841792cd5b6a7d86864cbc2d334a3 100644 (file)
@@ -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);
 }
 
 /**