aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc/xprtrdma
diff options
context:
space:
mode:
authorSagi Grimberg <sagig@mellanox.com>2015-07-30 03:32:39 -0400
committerDoug Ledford <dledford@redhat.com>2015-08-30 18:08:45 -0400
commit0410e38eca85e042f5d5a281dbcc792db701ed44 (patch)
tree85a25ba682e247cff9b0d8a5b72e4a39f3dd9dbc /net/sunrpc/xprtrdma
parent563b67c5f90abeae1038008e6c9c187fb36ad35c (diff)
xprtrdma, svcrdma: Convert to ib_alloc_mr
Signed-off-by: Sagi Grimberg <sagig@mellanox.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'net/sunrpc/xprtrdma')
-rw-r--r--net/sunrpc/xprtrdma/frwr_ops.c6
-rw-r--r--net/sunrpc/xprtrdma/svc_rdma_transport.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/net/sunrpc/xprtrdma/frwr_ops.c b/net/sunrpc/xprtrdma/frwr_ops.c
index 04ea914201b2..5318951b3b53 100644
--- a/net/sunrpc/xprtrdma/frwr_ops.c
+++ b/net/sunrpc/xprtrdma/frwr_ops.c
@@ -117,7 +117,7 @@ __frwr_recovery_worker(struct work_struct *work)
117 if (ib_dereg_mr(r->r.frmr.fr_mr)) 117 if (ib_dereg_mr(r->r.frmr.fr_mr))
118 goto out_fail; 118 goto out_fail;
119 119
120 r->r.frmr.fr_mr = ib_alloc_fast_reg_mr(pd, depth); 120 r->r.frmr.fr_mr = ib_alloc_mr(pd, IB_MR_TYPE_MEM_REG, depth);
121 if (IS_ERR(r->r.frmr.fr_mr)) 121 if (IS_ERR(r->r.frmr.fr_mr))
122 goto out_fail; 122 goto out_fail;
123 123
@@ -148,7 +148,7 @@ __frwr_init(struct rpcrdma_mw *r, struct ib_pd *pd, struct ib_device *device,
148 struct rpcrdma_frmr *f = &r->r.frmr; 148 struct rpcrdma_frmr *f = &r->r.frmr;
149 int rc; 149 int rc;
150 150
151 f->fr_mr = ib_alloc_fast_reg_mr(pd, depth); 151 f->fr_mr = ib_alloc_mr(pd, IB_MR_TYPE_MEM_REG, depth);
152 if (IS_ERR(f->fr_mr)) 152 if (IS_ERR(f->fr_mr))
153 goto out_mr_err; 153 goto out_mr_err;
154 f->fr_pgl = ib_alloc_fast_reg_page_list(device, depth); 154 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,
158 158
159out_mr_err: 159out_mr_err:
160 rc = PTR_ERR(f->fr_mr); 160 rc = PTR_ERR(f->fr_mr);
161 dprintk("RPC: %s: ib_alloc_fast_reg_mr status %i\n", 161 dprintk("RPC: %s: ib_alloc_mr status %i\n",
162 __func__, rc); 162 __func__, rc);
163 return rc; 163 return rc;
164 164
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
index fdc850ffc26c..8752a2d653b5 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -738,7 +738,7 @@ static struct svc_rdma_fastreg_mr *rdma_alloc_frmr(struct svcxprt_rdma *xprt)
738 if (!frmr) 738 if (!frmr)
739 goto err; 739 goto err;
740 740
741 mr = ib_alloc_fast_reg_mr(xprt->sc_pd, RPCSVC_MAXPAGES); 741 mr = ib_alloc_mr(xprt->sc_pd, IB_MR_TYPE_MEM_REG, RPCSVC_MAXPAGES);
742 if (IS_ERR(mr)) 742 if (IS_ERR(mr))
743 goto err_free_frmr; 743 goto err_free_frmr;
744 744