|
@@ -1687,7 +1687,7 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg,
|
|
|
struct rpcrdma_mw *mw = seg1->mr_chunk.rl_mw;
|
|
|
struct rpcrdma_frmr *frmr = &mw->r.frmr;
|
|
|
struct ib_mr *mr = frmr->fr_mr;
|
|
|
- struct ib_send_wr frmr_wr, *bad_wr;
|
|
|
+ struct ib_send_wr fastreg_wr, *bad_wr;
|
|
|
u8 key;
|
|
|
int len, pageoff;
|
|
|
int i, rc;
|
|
@@ -1721,15 +1721,15 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg,
|
|
|
|
|
|
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.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;
|
|
|
- frmr_wr.wr.fast_reg.page_shift = PAGE_SHIFT;
|
|
|
- frmr_wr.wr.fast_reg.length = page_no << PAGE_SHIFT;
|
|
|
- if (frmr_wr.wr.fast_reg.length < len) {
|
|
|
+ memset(&fastreg_wr, 0, sizeof(fastreg_wr));
|
|
|
+ fastreg_wr.wr_id = (unsigned long)(void *)mw;
|
|
|
+ fastreg_wr.opcode = IB_WR_FAST_REG_MR;
|
|
|
+ fastreg_wr.wr.fast_reg.iova_start = seg1->mr_dma;
|
|
|
+ fastreg_wr.wr.fast_reg.page_list = frmr->fr_pgl;
|
|
|
+ fastreg_wr.wr.fast_reg.page_list_len = page_no;
|
|
|
+ fastreg_wr.wr.fast_reg.page_shift = PAGE_SHIFT;
|
|
|
+ fastreg_wr.wr.fast_reg.length = page_no << PAGE_SHIFT;
|
|
|
+ if (fastreg_wr.wr.fast_reg.length < len) {
|
|
|
rc = -EIO;
|
|
|
goto out_err;
|
|
|
}
|
|
@@ -1738,13 +1738,13 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg,
|
|
|
key = (u8)(mr->rkey & 0x000000FF);
|
|
|
ib_update_fast_reg_key(mr, ++key);
|
|
|
|
|
|
- frmr_wr.wr.fast_reg.access_flags = (writing ?
|
|
|
+ fastreg_wr.wr.fast_reg.access_flags = (writing ?
|
|
|
IB_ACCESS_REMOTE_WRITE | IB_ACCESS_LOCAL_WRITE :
|
|
|
IB_ACCESS_REMOTE_READ);
|
|
|
- frmr_wr.wr.fast_reg.rkey = mr->rkey;
|
|
|
+ fastreg_wr.wr.fast_reg.rkey = mr->rkey;
|
|
|
DECR_CQCOUNT(&r_xprt->rx_ep);
|
|
|
|
|
|
- rc = ib_post_send(ia->ri_id->qp, &frmr_wr, &bad_wr);
|
|
|
+ rc = ib_post_send(ia->ri_id->qp, &fastreg_wr, &bad_wr);
|
|
|
if (rc) {
|
|
|
dprintk("RPC: %s: failed ib_post_send for register,"
|
|
|
" status %i\n", __func__, rc);
|