From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Tue, 10 Feb 2015 16:06:04 +0000 (-0500)
Subject: SUNRPC: Cleanup to remove xs_tcp_close()
X-Git-Tag: v4.0-rc1~119^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c627d31ba0696cbd829437af2be2f2dee3546b1e;p=karo-tx-linux.git

SUNRPC: Cleanup to remove xs_tcp_close()

xs_tcp_close() is now just a call to xs_tcp_shutdown(), so remove it,
and replace the entry in xs_tcp_ops.

Suggested-by: Anna Schumaker <anna.schumaker@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 19f7526f8965..66891e32c5e3 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -863,11 +863,6 @@ static void xs_close(struct rpc_xprt *xprt)
 	xprt_disconnect_done(xprt);
 }
 
-static void xs_tcp_close(struct rpc_xprt *xprt)
-{
-	xs_tcp_shutdown(xprt);
-}
-
 static void xs_xprt_free(struct rpc_xprt *xprt)
 {
 	xs_free_peer_addresses(xprt);
@@ -2500,7 +2495,7 @@ static struct rpc_xprt_ops xs_tcp_ops = {
 	.buf_free		= rpc_free,
 	.send_request		= xs_tcp_send_request,
 	.set_retrans_timeout	= xprt_set_retrans_timeout_def,
-	.close			= xs_tcp_close,
+	.close			= xs_tcp_shutdown,
 	.destroy		= xs_destroy,
 	.print_stats		= xs_tcp_print_stats,
 };