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

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

xprtrmda: Report address of frmr, not mw 



Tie frwr debugging messages together by always reporting the address
of the frwr.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 44829d02

net/sunrpc/xprtrdma/frwr_ops.c

+6 −2
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ __frwr_reset_mr(struct rpcrdma_ia *ia, struct rpcrdma_mw *r) 
		return PTR_ERR(f->fr_mr);

	}



	dprintk("RPC:       %s: recovered FRMR %p\n", __func__, r);

	dprintk("RPC:       %s: recovered FRMR %p\n", __func__, f);

	f->fr_state = FRMR_IS_INVALID;

	return 0;

}
@@ -397,7 +397,7 @@ frwr_op_map(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mr_seg *seg, 
		goto out_mapmr_err;



	dprintk("RPC:       %s: Using frmr %p to map %u segments (%u bytes)\n",

		__func__, mw, mw->mw_nents, mr->length);

		__func__, frmr, mw->mw_nents, mr->length);



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

	ib_update_fast_reg_key(mr, ++key);
@@ -450,6 +450,8 @@ __frwr_prepare_linv_wr(struct rpcrdma_mw *mw) 
	struct rpcrdma_frmr *f = &mw->frmr;

	struct ib_send_wr *invalidate_wr;



	dprintk("RPC:       %s: invalidating frmr %p\n", __func__, f);



	f->fr_state = FRMR_IS_INVALID;

	invalidate_wr = &f->fr_invwr;
@@ -532,6 +534,8 @@ frwr_op_unmap_sync(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req) 
	 */

unmap:

	list_for_each_entry_safe(mw, tmp, &req->rl_registered, mw_list) {

		dprintk("RPC:       %s: unmapping frmr %p\n",

			__func__, &mw->frmr);

		list_del_init(&mw->mw_list);

		ib_dma_unmap_sg(ia->ri_device,

				mw->mw_sg, mw->mw_nents, mw->mw_dir);