xprtrdma: Move fr_linv_done field to struct rpcrdma_mr

Clean up: Move more of struct rpcrdma_frwr into its parent.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/net/sunrpc/xprtrdma/frwr_ops.c b/net/sunrpc/xprtrdma/frwr_ops.c
index 2a886a28d82b5087d6d834b44156c116d8a76ad5..7d7a64d2ca4aaae23a6eedc626ab30f84e77b51d 100644 (file)
--- a/net/sunrpc/xprtrdma/frwr_ops.c
+++ b/net/sunrpc/xprtrdma/frwr_ops.c
@@ -142,7 +142,7 @@ int frwr_mr_init(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mr *mr)
        mr->frwr.fr_mr = frmr;
        mr->mr_device = NULL;
        INIT_LIST_HEAD(&mr->mr_list);
-       init_completion(&mr->frwr.fr_linv_done);
+       init_completion(&mr->mr_linv_done);
        frwr_cid_init(ep, mr);
 
        sg_init_table(sg, depth);
@@ -481,12 +481,11 @@ static void frwr_wc_localinv_wake(struct ib_cq *cq, struct ib_wc *wc)
 {
        struct ib_cqe *cqe = wc->wr_cqe;
        struct rpcrdma_mr *mr = container_of(cqe, struct rpcrdma_mr, mr_cqe);
-       struct rpcrdma_frwr *frwr = &mr->frwr;
 
        /* WARNING: Only wr_cqe and status are reliable at this point */
        trace_xprtrdma_wc_li_wake(wc, &mr->mr_cid);
        frwr_mr_done(wc, mr);
-       complete(&frwr->fr_linv_done);
+       complete(&mr->mr_linv_done);
 
        rpcrdma_flush_disconnect(cq->cq_context, wc);
 }
@@ -544,7 +543,7 @@ void frwr_unmap_sync(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req)
         * are complete.
         */
        last->wr_cqe->done = frwr_wc_localinv_wake;
-       reinit_completion(&frwr->fr_linv_done);
+       reinit_completion(&mr->mr_linv_done);
 
        /* Transport disconnect drains the receive CQ before it
         * replaces the QP. The RPC reply handler won't call us
@@ -558,7 +557,7 @@ void frwr_unmap_sync(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req)
         * not happen, so don't wait in that case.
         */
        if (bad_wr != first)
-               wait_for_completion(&frwr->fr_linv_done);
+               wait_for_completion(&mr->mr_linv_done);
        if (!rc)
                return;
 

diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h
index f72b69c3f0eaf0b52d830973285a961e26b72372..1374054b73fd036c7c398abb11df769510effd49 100644 (file)
--- a/net/sunrpc/xprtrdma/xprt_rdma.h
+++ b/net/sunrpc/xprtrdma/xprt_rdma.h
@@ -231,7 +231,6 @@ struct rpcrdma_sendctx {
  */
 struct rpcrdma_frwr {
        struct ib_mr                    *fr_mr;
-       struct completion               fr_linv_done;
        union {
                struct ib_reg_wr        fr_regwr;
                struct ib_send_wr       fr_invwr;
@@ -247,6 +246,7 @@ struct rpcrdma_mr {
        int                     mr_nents;
        enum dma_data_direction mr_dir;
        struct ib_cqe           mr_cqe;
+       struct completion       mr_linv_done;
        struct rpcrdma_frwr     frwr;
        struct rpcrdma_xprt     *mr_xprt;
        u32                     mr_handle;