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

Commit 0410e38e authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Doug Ledford
Browse files

xprtrdma, svcrdma: Convert to ib_alloc_mr 



Signed-off-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 563b67c5

net/sunrpc/xprtrdma/frwr_ops.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -117,7 +117,7 @@ __frwr_recovery_worker(struct work_struct *work) 
	if (ib_dereg_mr(r->r.frmr.fr_mr))

	if (ib_dereg_mr(r->r.frmr.fr_mr))

		goto out_fail;

		goto out_fail;





	r->r.frmr.fr_mr = ib_alloc_fast_reg_mr(pd, depth);

	r->r.frmr.fr_mr = ib_alloc_mr(pd, IB_MR_TYPE_MEM_REG, depth);

	if (IS_ERR(r->r.frmr.fr_mr))

	if (IS_ERR(r->r.frmr.fr_mr))

		goto out_fail;

		goto out_fail;
@@ -148,7 +148,7 @@ __frwr_init(struct rpcrdma_mw *r, struct ib_pd *pd, struct ib_device *device, 
	struct rpcrdma_frmr *f = &r->r.frmr;

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

	int rc;

	int rc;





	f->fr_mr = ib_alloc_fast_reg_mr(pd, depth);

	f->fr_mr = ib_alloc_mr(pd, IB_MR_TYPE_MEM_REG, depth);

	if (IS_ERR(f->fr_mr))

	if (IS_ERR(f->fr_mr))

		goto out_mr_err;

		goto out_mr_err;

	f->fr_pgl = ib_alloc_fast_reg_page_list(device, depth);

	f->fr_pgl = ib_alloc_fast_reg_page_list(device, depth);
@@ -158,7 +158,7 @@ __frwr_init(struct rpcrdma_mw *r, struct ib_pd *pd, struct ib_device *device, 




out_mr_err:

out_mr_err:

	rc = PTR_ERR(f->fr_mr);

	rc = PTR_ERR(f->fr_mr);

	dprintk("RPC:       %s: ib_alloc_fast_reg_mr status %i\n",

	dprintk("RPC:       %s: ib_alloc_mr status %i\n",

		__func__, rc);

		__func__, rc);

	return rc;

	return rc;

net/sunrpc/xprtrdma/svc_rdma_transport.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -738,7 +738,7 @@ static struct svc_rdma_fastreg_mr *rdma_alloc_frmr(struct svcxprt_rdma *xprt) 
	if (!frmr)

	if (!frmr)

		goto err;

		goto err;





	mr = ib_alloc_fast_reg_mr(xprt->sc_pd, RPCSVC_MAXPAGES);

	mr = ib_alloc_mr(xprt->sc_pd, IB_MR_TYPE_MEM_REG, RPCSVC_MAXPAGES);

	if (IS_ERR(mr))

	if (IS_ERR(mr))

		goto err_free_frmr;

		goto err_free_frmr;