diff options
-rw-r--r-- | net/sunrpc/xprtrdma/verbs.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 08c92355c64c..80c01638a66b 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c | |||
@@ -1687,7 +1687,7 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg, | |||
1687 | struct rpcrdma_mw *mw = seg1->mr_chunk.rl_mw; | 1687 | struct rpcrdma_mw *mw = seg1->mr_chunk.rl_mw; |
1688 | struct rpcrdma_frmr *frmr = &mw->r.frmr; | 1688 | struct rpcrdma_frmr *frmr = &mw->r.frmr; |
1689 | struct ib_mr *mr = frmr->fr_mr; | 1689 | struct ib_mr *mr = frmr->fr_mr; |
1690 | struct ib_send_wr frmr_wr, *bad_wr; | 1690 | struct ib_send_wr fastreg_wr, *bad_wr; |
1691 | u8 key; | 1691 | u8 key; |
1692 | int len, pageoff; | 1692 | int len, pageoff; |
1693 | int i, rc; | 1693 | int i, rc; |
@@ -1721,15 +1721,15 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg, | |||
1721 | 1721 | ||
1722 | frmr->fr_state = FRMR_IS_VALID; | 1722 | frmr->fr_state = FRMR_IS_VALID; |
1723 | 1723 | ||
1724 | memset(&frmr_wr, 0, sizeof frmr_wr); | 1724 | memset(&fastreg_wr, 0, sizeof(fastreg_wr)); |
1725 | frmr_wr.wr_id = (unsigned long)(void *)mw; | 1725 | fastreg_wr.wr_id = (unsigned long)(void *)mw; |
1726 | frmr_wr.opcode = IB_WR_FAST_REG_MR; | 1726 | fastreg_wr.opcode = IB_WR_FAST_REG_MR; |
1727 | frmr_wr.wr.fast_reg.iova_start = seg1->mr_dma; | 1727 | fastreg_wr.wr.fast_reg.iova_start = seg1->mr_dma; |
1728 | frmr_wr.wr.fast_reg.page_list = frmr->fr_pgl; | 1728 | fastreg_wr.wr.fast_reg.page_list = frmr->fr_pgl; |
1729 | frmr_wr.wr.fast_reg.page_list_len = page_no; | 1729 | fastreg_wr.wr.fast_reg.page_list_len = page_no; |
1730 | frmr_wr.wr.fast_reg.page_shift = PAGE_SHIFT; | 1730 | fastreg_wr.wr.fast_reg.page_shift = PAGE_SHIFT; |
1731 | frmr_wr.wr.fast_reg.length = page_no << PAGE_SHIFT; | 1731 | fastreg_wr.wr.fast_reg.length = page_no << PAGE_SHIFT; |
1732 | if (frmr_wr.wr.fast_reg.length < len) { | 1732 | if (fastreg_wr.wr.fast_reg.length < len) { |
1733 | rc = -EIO; | 1733 | rc = -EIO; |
1734 | goto out_err; | 1734 | goto out_err; |
1735 | } | 1735 | } |
@@ -1738,13 +1738,13 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg, | |||
1738 | key = (u8)(mr->rkey & 0x000000FF); | 1738 | key = (u8)(mr->rkey & 0x000000FF); |
1739 | ib_update_fast_reg_key(mr, ++key); | 1739 | ib_update_fast_reg_key(mr, ++key); |
1740 | 1740 | ||
1741 | frmr_wr.wr.fast_reg.access_flags = (writing ? | 1741 | fastreg_wr.wr.fast_reg.access_flags = (writing ? |
1742 | IB_ACCESS_REMOTE_WRITE | IB_ACCESS_LOCAL_WRITE : | 1742 | IB_ACCESS_REMOTE_WRITE | IB_ACCESS_LOCAL_WRITE : |
1743 | IB_ACCESS_REMOTE_READ); | 1743 | IB_ACCESS_REMOTE_READ); |
1744 | frmr_wr.wr.fast_reg.rkey = mr->rkey; | 1744 | fastreg_wr.wr.fast_reg.rkey = mr->rkey; |
1745 | DECR_CQCOUNT(&r_xprt->rx_ep); | 1745 | DECR_CQCOUNT(&r_xprt->rx_ep); |
1746 | 1746 | ||
1747 | rc = ib_post_send(ia->ri_id->qp, &frmr_wr, &bad_wr); | 1747 | rc = ib_post_send(ia->ri_id->qp, &fastreg_wr, &bad_wr); |
1748 | if (rc) { | 1748 | if (rc) { |
1749 | dprintk("RPC: %s: failed ib_post_send for register," | 1749 | dprintk("RPC: %s: failed ib_post_send for register," |
1750 | " status %i\n", __func__, rc); | 1750 | " status %i\n", __func__, rc); |