aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Tucker <tom@opengridcomputing.com>2008-05-07 16:47:42 -0400
committerTom Tucker <tom@opengridcomputing.com>2008-05-19 08:34:01 -0400
commit008fdbc57164b0ac237ad6ee2766944f02ac9c28 (patch)
treee1637f39b6454a6ae94a00e90bd047d47bdfdf7e
parentaf261af4db14230fb35bcdc0ba9ef78ed6cf7bc1 (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>
-rw-r--r--include/linux/sunrpc/svc_rdma.h4
-rw-r--r--net/sunrpc/xprtrdma/svc_rdma_recvfrom.c2
-rw-r--r--net/sunrpc/xprtrdma/svc_rdma_transport.c9
3 files changed, 7 insertions, 8 deletions
diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
index f5f15ae2438b..05eb4664d0dd 100644
--- a/include/linux/sunrpc/svc_rdma.h
+++ b/include/linux/sunrpc/svc_rdma.h
@@ -166,8 +166,8 @@ extern int svc_rdma_sendto(struct svc_rqst *);
166 166
167/* svc_rdma_transport.c */ 167/* svc_rdma_transport.c */
168extern int svc_rdma_send(struct svcxprt_rdma *, struct ib_send_wr *); 168extern int svc_rdma_send(struct svcxprt_rdma *, struct ib_send_wr *);
169extern int svc_rdma_send_error(struct svcxprt_rdma *, struct rpcrdma_msg *, 169extern void svc_rdma_send_error(struct svcxprt_rdma *, struct rpcrdma_msg *,
170 enum rpcrdma_errcode); 170 enum rpcrdma_errcode);
171struct page *svc_rdma_get_page(void); 171struct page *svc_rdma_get_page(void);
172extern int svc_rdma_post_recv(struct svcxprt_rdma *); 172extern int svc_rdma_post_recv(struct svcxprt_rdma *);
173extern int svc_rdma_create_listen(struct svc_serv *, int, struct sockaddr *); 173extern int svc_rdma_create_listen(struct svc_serv *, int, struct sockaddr *);
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
1117int svc_rdma_send_error(struct svcxprt_rdma *xprt, struct rpcrdma_msg *rmsgp, 1117void 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}