diff options
author | Tom Tucker <tom@opengridcomputing.com> | 2008-05-07 16:47:42 -0400 |
---|---|---|
committer | Tom Tucker <tom@opengridcomputing.com> | 2008-05-19 08:34:01 -0400 |
commit | 008fdbc57164b0ac237ad6ee2766944f02ac9c28 (patch) | |
tree | e1637f39b6454a6ae94a00e90bd047d47bdfdf7e /net/sunrpc | |
parent | af261af4db14230fb35bcdc0ba9ef78ed6cf7bc1 (diff) |
svcrdma: Change svc_rdma_send_error return type to void
The svc_rdma_send_error function is called when an RPCRDMA protocol
error is detected. This function attempts to post an error reply message.
Since an error posting to a transport in error is ignored, change
the return type to void.
Signed-off-by: Tom Tucker <tom@opengridcomputing.com>
Diffstat (limited to 'net/sunrpc')
-rw-r--r-- | net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 2 | ||||
-rw-r--r-- | net/sunrpc/xprtrdma/svc_rdma_transport.c | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c index c016f5ca0ce5..6b16d8cd5682 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | |||
@@ -497,7 +497,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp) | |||
497 | /* If the request is invalid, reply with an error */ | 497 | /* If the request is invalid, reply with an error */ |
498 | if (len < 0) { | 498 | if (len < 0) { |
499 | if (len == -ENOSYS) | 499 | if (len == -ENOSYS) |
500 | (void)svc_rdma_send_error(rdma_xprt, rmsgp, ERR_VERS); | 500 | svc_rdma_send_error(rdma_xprt, rmsgp, ERR_VERS); |
501 | goto close_out; | 501 | goto close_out; |
502 | } | 502 | } |
503 | 503 | ||
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c index c7545203f4b3..e132509d1db0 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c | |||
@@ -1114,8 +1114,8 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr) | |||
1114 | return ret; | 1114 | return ret; |
1115 | } | 1115 | } |
1116 | 1116 | ||
1117 | int svc_rdma_send_error(struct svcxprt_rdma *xprt, struct rpcrdma_msg *rmsgp, | 1117 | void svc_rdma_send_error(struct svcxprt_rdma *xprt, struct rpcrdma_msg *rmsgp, |
1118 | enum rpcrdma_errcode err) | 1118 | enum rpcrdma_errcode err) |
1119 | { | 1119 | { |
1120 | struct ib_send_wr err_wr; | 1120 | struct ib_send_wr err_wr; |
1121 | struct ib_sge sge; | 1121 | struct ib_sge sge; |
@@ -1153,9 +1153,8 @@ int svc_rdma_send_error(struct svcxprt_rdma *xprt, struct rpcrdma_msg *rmsgp, | |||
1153 | /* Post It */ | 1153 | /* Post It */ |
1154 | ret = svc_rdma_send(xprt, &err_wr); | 1154 | ret = svc_rdma_send(xprt, &err_wr); |
1155 | if (ret) { | 1155 | if (ret) { |
1156 | dprintk("svcrdma: Error posting send = %d\n", ret); | 1156 | dprintk("svcrdma: Error %d posting send for protocol error\n", |
1157 | ret); | ||
1157 | svc_rdma_put_context(ctxt, 1); | 1158 | svc_rdma_put_context(ctxt, 1); |
1158 | } | 1159 | } |
1159 | |||
1160 | return ret; | ||
1161 | } | 1160 | } |