svcrdma: Remove svc_rdma_op_ctxt::wc_status

Clean up: Completion status is already reported in the individual
completion handlers. Save a few bytes in struct svc_rdma_op_ctxt.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
index 43d7c709d11711a818f8f1d8d9315b3e198db6ee..757fb963696c76b3ab24f754ff89424fb428fc79 100644 (file)
--- a/include/linux/sunrpc/svc_rdma.h
+++ b/include/linux/sunrpc/svc_rdma.h
@@ -79,7 +79,6 @@ struct svc_rdma_op_ctxt {
        struct ib_cqe reg_cqe;
        struct ib_cqe inv_cqe;
        struct list_head dto_q;
-       enum ib_wc_status wc_status;
        u32 byte_len;
        u32 position;
        struct svcxprt_rdma *xprt;

diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
index 283246e0afc2afa0b19f9acd82a529f1d9d35355..428ab4ef77f3a7cc266ce623688cc01321441778 100644 (file)
--- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
@@ -640,8 +640,8 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
                        goto defer;
                goto out;
        }
-       dprintk("svcrdma: processing ctxt=%p on xprt=%p, rqstp=%p, status=%d\n",
-               ctxt, rdma_xprt, rqstp, ctxt->wc_status);
+       dprintk("svcrdma: processing ctxt=%p on xprt=%p, rqstp=%p\n",
+               ctxt, rdma_xprt, rqstp);
        atomic_inc(&rdma_stat_recv);
 
        /* Build up the XDR from the receive buffers. */

diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
index a613ebd1dd85c8bbac5de09a394992577080d17a..f9d961c00dd2c1bd1a318dcf6ab906b78d201a6b 100644 (file)
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -393,7 +393,6 @@ static void svc_rdma_wc_receive(struct ib_cq *cq, struct ib_wc *wc)
 
        /* WARNING: Only wc->wr_cqe and wc->status are reliable */
        ctxt = container_of(cqe, struct svc_rdma_op_ctxt, cqe);
-       ctxt->wc_status = wc->status;
        svc_rdma_unmap_dma(ctxt);
 
        if (wc->status != IB_WC_SUCCESS)