Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f590e878 authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

xprtrdma: Rename frmr_wr 



Clean up: Name frmr_wr after the opcode of the Work Request,
consistent with the send and local invalidation paths.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Tested-by: default avatarSteve Wise <swise@opengridcomputing.com>
Tested-by: default avatarShirley Ma <shirley.ma@oracle.com>
Tested-by: default avatarDevesh Sharma <devesh.sharma@emulex.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent dab7e3b8

net/sunrpc/xprtrdma/verbs.c

+13 −13
Original line number Original line Diff line number Diff line
@@ -1687,7 +1687,7 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg, 
	struct rpcrdma_mw *mw = seg1->mr_chunk.rl_mw;

	struct rpcrdma_mw *mw = seg1->mr_chunk.rl_mw;

	struct rpcrdma_frmr *frmr = &mw->r.frmr;

	struct rpcrdma_frmr *frmr = &mw->r.frmr;

	struct ib_mr *mr = frmr->fr_mr;

	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;

	u8 key;

	int len, pageoff;

	int len, pageoff;

	int i, rc;

	int i, rc;
@@ -1721,15 +1721,15 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg, 




	frmr->fr_state = FRMR_IS_VALID;

	frmr->fr_state = FRMR_IS_VALID;





	memset(&frmr_wr, 0, sizeof frmr_wr);

	memset(&fastreg_wr, 0, sizeof(fastreg_wr));

	frmr_wr.wr_id = (unsigned long)(void *)mw;

	fastreg_wr.wr_id = (unsigned long)(void *)mw;

	frmr_wr.opcode = IB_WR_FAST_REG_MR;

	fastreg_wr.opcode = IB_WR_FAST_REG_MR;

	frmr_wr.wr.fast_reg.iova_start = seg1->mr_dma;

	fastreg_wr.wr.fast_reg.iova_start = seg1->mr_dma;

	frmr_wr.wr.fast_reg.page_list = frmr->fr_pgl;

	fastreg_wr.wr.fast_reg.page_list = frmr->fr_pgl;

	frmr_wr.wr.fast_reg.page_list_len = page_no;

	fastreg_wr.wr.fast_reg.page_list_len = page_no;

	frmr_wr.wr.fast_reg.page_shift = PAGE_SHIFT;

	fastreg_wr.wr.fast_reg.page_shift = PAGE_SHIFT;

	frmr_wr.wr.fast_reg.length = page_no << PAGE_SHIFT;

	fastreg_wr.wr.fast_reg.length = page_no << PAGE_SHIFT;

	if (frmr_wr.wr.fast_reg.length < len) {

	if (fastreg_wr.wr.fast_reg.length < len) {

		rc = -EIO;

		rc = -EIO;

		goto out_err;

		goto out_err;

	}

	}
@@ -1738,13 +1738,13 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg, 
	key = (u8)(mr->rkey & 0x000000FF);

	key = (u8)(mr->rkey & 0x000000FF);

	ib_update_fast_reg_key(mr, ++key);

	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_WRITE | IB_ACCESS_LOCAL_WRITE :

				IB_ACCESS_REMOTE_READ);

				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);

	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) {

	if (rc) {

		dprintk("RPC:       %s: failed ib_post_send for register,"

		dprintk("RPC:       %s: failed ib_post_send for register,"

			" status %i\n", __func__, rc);

			" status %i\n", __func__, rc);