diff options
author | Vasily Averin <vvs@virtuozzo.com> | 2018-12-24 06:45:25 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2018-12-27 21:01:41 -0500 |
commit | 4aa5cffefa6f8af8f16490df58b8f0d827911b58 (patch) | |
tree | 3cdcf6aabf34899b2d174104cd9bc14601694913 /net | |
parent | a289ce5311f406bf846614591300a948ebc42062 (diff) |
sunrpc: remove unused bc_up operation from rpc_xprt_ops
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/sunrpc/xprtrdma/backchannel.c | 20 | ||||
-rw-r--r-- | net/sunrpc/xprtrdma/transport.c | 1 | ||||
-rw-r--r-- | net/sunrpc/xprtrdma/xprt_rdma.h | 1 | ||||
-rw-r--r-- | net/sunrpc/xprtsock.c | 12 |
4 files changed, 0 insertions, 34 deletions
diff --git a/net/sunrpc/xprtrdma/backchannel.c b/net/sunrpc/xprtrdma/backchannel.c index e5b367a3e517..edba0d35776b 100644 --- a/net/sunrpc/xprtrdma/backchannel.c +++ b/net/sunrpc/xprtrdma/backchannel.c | |||
@@ -114,26 +114,6 @@ out_err: | |||
114 | } | 114 | } |
115 | 115 | ||
116 | /** | 116 | /** |
117 | * xprt_rdma_bc_up - Create transport endpoint for backchannel service | ||
118 | * @serv: server endpoint | ||
119 | * @net: network namespace | ||
120 | * | ||
121 | * The "xprt" is an implied argument: it supplies the name of the | ||
122 | * backchannel transport class. | ||
123 | * | ||
124 | * Returns zero on success, negative errno on failure | ||
125 | */ | ||
126 | int xprt_rdma_bc_up(struct svc_serv *serv, struct net *net) | ||
127 | { | ||
128 | int ret; | ||
129 | |||
130 | ret = svc_create_xprt(serv, "rdma-bc", net, PF_INET, 0, 0); | ||
131 | if (ret < 0) | ||
132 | return ret; | ||
133 | return 0; | ||
134 | } | ||
135 | |||
136 | /** | ||
137 | * xprt_rdma_bc_maxpayload - Return maximum backchannel message size | 117 | * xprt_rdma_bc_maxpayload - Return maximum backchannel message size |
138 | * @xprt: transport | 118 | * @xprt: transport |
139 | * | 119 | * |
diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c index ae2a83828953..9141068693fa 100644 --- a/net/sunrpc/xprtrdma/transport.c +++ b/net/sunrpc/xprtrdma/transport.c | |||
@@ -827,7 +827,6 @@ static const struct rpc_xprt_ops xprt_rdma_procs = { | |||
827 | .inject_disconnect = xprt_rdma_inject_disconnect, | 827 | .inject_disconnect = xprt_rdma_inject_disconnect, |
828 | #if defined(CONFIG_SUNRPC_BACKCHANNEL) | 828 | #if defined(CONFIG_SUNRPC_BACKCHANNEL) |
829 | .bc_setup = xprt_rdma_bc_setup, | 829 | .bc_setup = xprt_rdma_bc_setup, |
830 | .bc_up = xprt_rdma_bc_up, | ||
831 | .bc_maxpayload = xprt_rdma_bc_maxpayload, | 830 | .bc_maxpayload = xprt_rdma_bc_maxpayload, |
832 | .bc_free_rqst = xprt_rdma_bc_free_rqst, | 831 | .bc_free_rqst = xprt_rdma_bc_free_rqst, |
833 | .bc_destroy = xprt_rdma_bc_destroy, | 832 | .bc_destroy = xprt_rdma_bc_destroy, |
diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h index a13ccb643ce0..9218dbebedce 100644 --- a/net/sunrpc/xprtrdma/xprt_rdma.h +++ b/net/sunrpc/xprtrdma/xprt_rdma.h | |||
@@ -661,7 +661,6 @@ void xprt_rdma_cleanup(void); | |||
661 | */ | 661 | */ |
662 | #if defined(CONFIG_SUNRPC_BACKCHANNEL) | 662 | #if defined(CONFIG_SUNRPC_BACKCHANNEL) |
663 | int xprt_rdma_bc_setup(struct rpc_xprt *, unsigned int); | 663 | int xprt_rdma_bc_setup(struct rpc_xprt *, unsigned int); |
664 | int xprt_rdma_bc_up(struct svc_serv *, struct net *); | ||
665 | size_t xprt_rdma_bc_maxpayload(struct rpc_xprt *); | 664 | size_t xprt_rdma_bc_maxpayload(struct rpc_xprt *); |
666 | int rpcrdma_bc_post_recv(struct rpcrdma_xprt *, unsigned int); | 665 | int rpcrdma_bc_post_recv(struct rpcrdma_xprt *, unsigned int); |
667 | void rpcrdma_bc_receive_call(struct rpcrdma_xprt *, struct rpcrdma_rep *); | 666 | void rpcrdma_bc_receive_call(struct rpcrdma_xprt *, struct rpcrdma_rep *); |
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index ae77c71c1f64..5b392b3df90a 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c | |||
@@ -1405,17 +1405,6 @@ static void xs_tcp_force_close(struct rpc_xprt *xprt) | |||
1405 | } | 1405 | } |
1406 | 1406 | ||
1407 | #if defined(CONFIG_SUNRPC_BACKCHANNEL) | 1407 | #if defined(CONFIG_SUNRPC_BACKCHANNEL) |
1408 | static int xs_tcp_bc_up(struct svc_serv *serv, struct net *net) | ||
1409 | { | ||
1410 | int ret; | ||
1411 | |||
1412 | ret = svc_create_xprt(serv, "tcp-bc", net, PF_INET, 0, | ||
1413 | SVC_SOCK_ANONYMOUS); | ||
1414 | if (ret < 0) | ||
1415 | return ret; | ||
1416 | return 0; | ||
1417 | } | ||
1418 | |||
1419 | static size_t xs_tcp_bc_maxpayload(struct rpc_xprt *xprt) | 1408 | static size_t xs_tcp_bc_maxpayload(struct rpc_xprt *xprt) |
1420 | { | 1409 | { |
1421 | return PAGE_SIZE; | 1410 | return PAGE_SIZE; |
@@ -2672,7 +2661,6 @@ static const struct rpc_xprt_ops xs_tcp_ops = { | |||
2672 | .inject_disconnect = xs_inject_disconnect, | 2661 | .inject_disconnect = xs_inject_disconnect, |
2673 | #ifdef CONFIG_SUNRPC_BACKCHANNEL | 2662 | #ifdef CONFIG_SUNRPC_BACKCHANNEL |
2674 | .bc_setup = xprt_setup_bc, | 2663 | .bc_setup = xprt_setup_bc, |
2675 | .bc_up = xs_tcp_bc_up, | ||
2676 | .bc_maxpayload = xs_tcp_bc_maxpayload, | 2664 | .bc_maxpayload = xs_tcp_bc_maxpayload, |
2677 | .bc_free_rqst = xprt_free_bc_rqst, | 2665 | .bc_free_rqst = xprt_free_bc_rqst, |
2678 | .bc_destroy = xprt_destroy_bc, | 2666 | .bc_destroy = xprt_destroy_bc, |