1 files changed, 4 insertions, 5 deletions

diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index 7459b867d7d6..3e8b3881548d 100644
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -159,10 +159,7 @@ rpcrdma_sendcq_process_wc(struct ib_wc *wc)
                 return;
         }
 
-        if (wc->opcode == IB_WC_FAST_REG_MR)
-                frmr->r.frmr.fr_state = FRMR_IS_VALID;
-        else if (wc->opcode == IB_WC_LOCAL_INV)
-                frmr->r.frmr.fr_state = FRMR_IS_INVALID;
+        frmr->r.frmr.fr_state = FRMR_IS_INVALID;
 }
 
 static int
@@ -1727,10 +1724,11 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg,
         dprintk("RPC:       %s: Using frmr %p to map %d segments\n",
                 __func__, mw, i);
 
+        frmr->fr_state = FRMR_IS_VALID;
+
         memset(&frmr_wr, 0, sizeof frmr_wr);
         frmr_wr.wr_id = (unsigned long)(void *)mw;
         frmr_wr.opcode = IB_WR_FAST_REG_MR;
-        frmr_wr.send_flags = IB_SEND_SIGNALED;
         frmr_wr.wr.fast_reg.iova_start = seg1->mr_dma;
         frmr_wr.wr.fast_reg.page_list = frmr->fr_pgl;
         frmr_wr.wr.fast_reg.page_list_len = page_no;
@@ -1766,6 +1764,7 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg,
         *nsegs = i;
         return 0;
 out_err:
+        frmr->fr_state = FRMR_IS_INVALID;
         while (i--)
                 rpcrdma_unmap_one(ia, --seg);
         return rc;