svcrdma: Make svc_rdma_send_error_msg() a global function (c65b326b) · Commits · 戴 / test

include/linux/sunrpc/svc_rdma.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -195,6 +195,10 @@ extern int svc_rdma_map_reply_msg(struct svcxprt_rdma *rdma,
		struct svc_rdma_send_ctxt *sctxt,
		const struct svc_rdma_recv_ctxt *rctxt,
		struct xdr_buf *xdr);
		extern void svc_rdma_send_error_msg(struct svcxprt_rdma *rdma,
		struct svc_rdma_send_ctxt *sctxt,
		struct svc_rdma_recv_ctxt *rctxt,
		int status);
		extern int svc_rdma_sendto(struct svc_rqst *);
		extern int svc_rdma_read_payload(struct svc_rqst *rqstp, unsigned int offset,
		unsigned int length);

+19 −9

Original line number	Diff line number	Diff line
		@@ -804,13 +804,22 @@ static int svc_rdma_send_reply_msg(struct svcxprt_rdma *rdma,
		return svc_rdma_send(rdma, &sctxt->sc_send_wr);
		}

		/* Given the client-provided Write and Reply chunks, the server was not
		* able to form a complete reply. Return an RDMA_ERROR message so the
		* client can retire this RPC transaction.
		*
		* Remote Invalidation is skipped for simplicity.
		/**
		* svc_rdma_send_error_msg - Send an RPC/RDMA v1 error response
		* @rdma: controlling transport context
		* @sctxt: Send context for the response
		* @rctxt: Receive context for incoming bad message
		* @status: negative errno indicating error that occurred
		*
		* Given the client-provided Read, Write, and Reply chunks, the
		* server was not able to parse the Call or form a complete Reply.
		* Return an RDMA_ERROR message so the client can retire the RPC
		* transaction.
		*
		* The caller does not have to release @sctxt. It is released by
		* Send completion, or by this function on error.
		*/
		static void svc_rdma_send_error_msg(struct svcxprt_rdma *rdma,
		void svc_rdma_send_error_msg(struct svcxprt_rdma *rdma,
		struct svc_rdma_send_ctxt *sctxt,
		struct svc_rdma_recv_ctxt *rctxt,
		int status)
		@@ -852,6 +861,7 @@ static void svc_rdma_send_error_msg(struct svcxprt_rdma *rdma,
		trace_svcrdma_err_chunk(*rdma_argp);
		}

		/* Remote Invalidation is skipped for simplicity. */
		sctxt->sc_send_wr.num_sge = 1;
		sctxt->sc_send_wr.opcode = IB_WR_SEND;
		sctxt->sc_sges[0].length = sctxt->sc_hdrbuf.len;