[PATCH 5/9] IB/srp: Introduce srp_finish_mapping()

[Bart Van Assche]

This patch does not change any functionality.

Signed-off-by: Bart Van Assche <bvanass...@acm.org>
Cc: Roland Dreier <rol...@purestorage.com>
Cc: David Dillow <d...@thedillows.org>
Cc: Sagi Grimberg <sa...@mellanox.com>
Cc: Vu Pham <v...@mellanox.com>
Cc: Sebastian Parschauer <sebastian.rie...@profitbricks.com>
---
 drivers/infiniband/ulp/srp/ib_srp.c | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/drivers/infiniband/ulp/srp/ib_srp.c 
b/drivers/infiniband/ulp/srp/ib_srp.c
index 5fb607b..ba434d6 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -935,16 +935,6 @@ static int srp_map_finish_fmr(struct srp_map_state *state,
        struct ib_pool_fmr *fmr;
        u64 io_addr = 0;
 
-       if (!state->npages)
-               return 0;
-
-       if (state->npages == 1) {
-               srp_map_desc(state, state->base_dma_addr, state->fmr_len,
-                            target->rkey);
-               state->npages = state->fmr_len = 0;
-               return 0;
-       }
-
        fmr = ib_fmr_pool_map_phys(dev->fmr_pool, state->pages,
                                   state->npages, io_addr);
        if (IS_ERR(fmr))
@@ -954,10 +944,33 @@ static int srp_map_finish_fmr(struct srp_map_state *state,
        state->nfmr++;
 
        srp_map_desc(state, 0, state->fmr_len, fmr->fmr->rkey);
-       state->npages = state->fmr_len = 0;
+
        return 0;
 }
 
+static int srp_finish_mapping(struct srp_map_state *state,
+                             struct srp_target_port *target)
+{
+       int ret = 0;
+
+       if (state->npages == 0)
+               return 0;
+
+       if (state->npages == 1) {
+               srp_map_desc(state, state->base_dma_addr, state->fmr_len,
+                            target->rkey);
+       } else {
+               ret = srp_map_finish_fmr(state, target);
+       }
+
+       if (ret == 0) {
+               state->npages = 0;
+               state->fmr_len = 0;
+       }
+
+       return ret;
+}
+
 static void srp_map_update_start(struct srp_map_state *state,
                                 struct scatterlist *sg, int sg_index,
                                 dma_addr_t dma_addr)
@@ -998,7 +1011,7 @@ static int srp_map_sg_entry(struct srp_map_state *state,
         * avoided using FMR on such page fragments.
         */
        if (dma_addr & ~dev->fmr_page_mask || dma_len > dev->fmr_max_size) {
-               ret = srp_map_finish_fmr(state, target);
+               ret = srp_finish_mapping(state, target);
                if (ret)
                        return ret;
 
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html