1 files changed, 2 insertions, 5 deletions

diff --git a/net/sunrpc/xprtrdma/fmr_ops.c b/net/sunrpc/xprtrdma/fmr_ops.c
index 009694b0c56e..9d50f3a5732a 100644
--- a/net/sunrpc/xprtrdma/fmr_ops.c
+++ b/net/sunrpc/xprtrdma/fmr_ops.c
@@ -186,15 +186,10 @@ static void
 __fmr_dma_unmap(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mr_seg *seg)
 {
         struct ib_device *device = r_xprt->rx_ia.ri_device;
-        struct rpcrdma_mw *mw = seg->rl_mw;
         int nsegs = seg->mr_nsegs;
 
-        seg->rl_mw = NULL;
-
         while (nsegs--)
                 rpcrdma_unmap_one(device, seg++);
-
-        rpcrdma_put_mw(r_xprt, mw);
 }
 
 /* Invalidate all memory regions that were registered for "req".
@@ -237,9 +232,11 @@ fmr_op_unmap_sync(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req)
                 seg = &req->rl_segments[i];
 
                 __fmr_dma_unmap(r_xprt, seg);
+                rpcrdma_put_mw(r_xprt, seg->rl_mw);
 
                 i += seg->mr_nsegs;
                 seg->mr_nsegs = 0;
+                seg->rl_mw = NULL;
         }
 
         req->rl_nchunks = 0;