aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc/xprtsock.c
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2015-02-10 11:06:04 -0500
committerTrond Myklebust <trond.myklebust@primarydata.com>2015-02-10 11:06:04 -0500
commitc627d31ba0696cbd829437af2be2f2dee3546b1e (patch)
tree2ffe50ce1e23f902f20477398a16864dfb3dfc36 /net/sunrpc/xprtsock.c
parent4c21462acc530bb81c6ae30e5bbd0b06f8c50626 (diff)
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>
Diffstat (limited to 'net/sunrpc/xprtsock.c')
-rw-r--r--net/sunrpc/xprtsock.c7
1 files changed, 1 insertions, 6 deletions
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)
863 xprt_disconnect_done(xprt); 863 xprt_disconnect_done(xprt);
864} 864}
865 865
866static void xs_tcp_close(struct rpc_xprt *xprt)
867{
868 xs_tcp_shutdown(xprt);
869}
870
871static void xs_xprt_free(struct rpc_xprt *xprt) 866static void xs_xprt_free(struct rpc_xprt *xprt)
872{ 867{
873 xs_free_peer_addresses(xprt); 868 xs_free_peer_addresses(xprt);
@@ -2500,7 +2495,7 @@ static struct rpc_xprt_ops xs_tcp_ops = {
2500 .buf_free = rpc_free, 2495 .buf_free = rpc_free,
2501 .send_request = xs_tcp_send_request, 2496 .send_request = xs_tcp_send_request,
2502 .set_retrans_timeout = xprt_set_retrans_timeout_def, 2497 .set_retrans_timeout = xprt_set_retrans_timeout_def,
2503 .close = xs_tcp_close, 2498 .close = xs_tcp_shutdown,
2504 .destroy = xs_destroy, 2499 .destroy = xs_destroy,
2505 .print_stats = xs_tcp_print_stats, 2500 .print_stats = xs_tcp_print_stats,
2506}; 2501};