ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

svcrdma: Consolidate send_error helper functions

Browse Source 
Final refactor: Replace internals of svc_rdma_send_error() with a
simple call to svc_rdma_send_error_msg().

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever
2020-03-24 17:57:18 -04:00
parent c65b326b1e
commit ba6cc97738
1 changed files with 5 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
View File

@@ -714,58 +714,16 @@ static void rdma_read_complete(struct svc_rqst *rqstp,
rqstp->rq_arg.buflen = head->rc_arg.buflen; rqstp->rq_arg.buflen = head->rc_arg.buflen;
} }
static void svc_rdma_send_error(struct svcxprt_rdma *xprt, static void svc_rdma_send_error(struct svcxprt_rdma *rdma,
struct svc_rdma_recv_ctxt *rctxt, struct svc_rdma_recv_ctxt *rctxt,
int status) int status)
{ {
__be32 *p, *rdma_argp = rctxt->rc_recv_buf; struct svc_rdma_send_ctxt *sctxt;
struct svc_rdma_send_ctxt *ctxt;
int ret;
ctxt = svc_rdma_send_ctxt_get(xprt); sctxt = svc_rdma_send_ctxt_get(rdma);
if (!ctxt) if (!sctxt)
return; return;
svc_rdma_send_error_msg(rdma, sctxt, rctxt, status);
p = xdr_reserve_space(&ctxt->sc_stream,
rpcrdma_fixed_maxsz * sizeof(*p));
if (!p)
goto put_ctxt;
*p++ = *rdma_argp;
*p++ = *(rdma_argp + 1);
*p++ = xprt->sc_fc_credits;
*p = rdma_error;
switch (status) {
case -EPROTONOSUPPORT:
p = xdr_reserve_space(&ctxt->sc_stream, 3 * sizeof(*p));
if (!p)
goto put_ctxt;
*p++ = err_vers;
*p++ = rpcrdma_version;
*p = rpcrdma_version;
trace_svcrdma_err_vers(*rdma_argp);
break;
default:
p = xdr_reserve_space(&ctxt->sc_stream, sizeof(*p));
if (!p)
goto put_ctxt;
*p = err_chunk;
trace_svcrdma_err_chunk(*rdma_argp);
}
ctxt->sc_send_wr.num_sge = 1;
ctxt->sc_send_wr.opcode = IB_WR_SEND;
ctxt->sc_sges[0].length = ctxt->sc_hdrbuf.len;
ret = svc_rdma_send(xprt, &ctxt->sc_send_wr);
if (ret)
goto put_ctxt;
return;
put_ctxt:
svc_rdma_send_ctxt_put(xprt, ctxt);
} }
/* By convention, backchannel calls arrive via rdma_msg type /* By convention, backchannel calls arrive via rdma_msg type