Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 008fdbc5 authored by Tom Tucker's avatar Tom Tucker
Browse files

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: default avatarTom Tucker <tom@opengridcomputing.com>
parent af261af4

include/linux/sunrpc/svc_rdma.h

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ extern int svc_rdma_sendto(struct svc_rqst *); 


/* svc_rdma_transport.c */

extern int svc_rdma_send(struct svcxprt_rdma *, struct ib_send_wr *);

extern int svc_rdma_send_error(struct svcxprt_rdma *, struct rpcrdma_msg *,

extern void svc_rdma_send_error(struct svcxprt_rdma *, struct rpcrdma_msg *,

				enum rpcrdma_errcode);

struct page *svc_rdma_get_page(void);

extern int svc_rdma_post_recv(struct svcxprt_rdma *);

net/sunrpc/xprtrdma/svc_rdma_recvfrom.c

+1 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp) 
	/* If the request is invalid, reply with an error */

	if (len < 0) {

		if (len == -ENOSYS)

			(void)svc_rdma_send_error(rdma_xprt, rmsgp, ERR_VERS);

			svc_rdma_send_error(rdma_xprt, rmsgp, ERR_VERS);

		goto close_out;

	}

net/sunrpc/xprtrdma/svc_rdma_transport.c

+4 −5
Original line number Diff line number Diff line
@@ -1114,7 +1114,7 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr) 
	return ret;

}



int svc_rdma_send_error(struct svcxprt_rdma *xprt, struct rpcrdma_msg *rmsgp,

void svc_rdma_send_error(struct svcxprt_rdma *xprt, struct rpcrdma_msg *rmsgp,

			 enum rpcrdma_errcode err)

{

	struct ib_send_wr err_wr;
@@ -1153,9 +1153,8 @@ int svc_rdma_send_error(struct svcxprt_rdma *xprt, struct rpcrdma_msg *rmsgp, 
	/* Post It */

	ret = svc_rdma_send(xprt, &err_wr);

	if (ret) {

		dprintk("svcrdma: Error posting send = %d\n", ret);

		dprintk("svcrdma: Error %d posting send for protocol error\n",

			ret);

		svc_rdma_put_context(ctxt, 1);

	}



	return ret;

}