RDS: Convert to ib_alloc_mr

Signed-off-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/net/rds/iw_rdma.c b/net/rds/iw_rdma.c
index dba8d0864f18046ee87a168d49cc159518fa2916..6a8fbd6e69e7cf721c26aa742cc957e3be109fbd 100644 (file)
--- a/net/rds/iw_rdma.c
+++ b/net/rds/iw_rdma.c
@@ -667,11 +667,12 @@ static int rds_iw_init_fastreg(struct rds_iw_mr_pool *pool,
        struct ib_mr *mr;
        int err;
 
-       mr = ib_alloc_fast_reg_mr(rds_iwdev->pd, pool->max_message_size);
+       mr = ib_alloc_mr(rds_iwdev->pd, IB_MR_TYPE_MEM_REG,
+                        pool->max_message_size);
        if (IS_ERR(mr)) {
                err = PTR_ERR(mr);
 
-               printk(KERN_WARNING "RDS/IW: ib_alloc_fast_reg_mr failed (err=%d)\n", err);
+               printk(KERN_WARNING "RDS/IW: ib_alloc_mr failed (err=%d)\n", err);
                return err;
        }
 

diff --git a/net/rds/iw_send.c b/net/rds/iw_send.c
index 334fe98c50841fed6f448cdb05eb01a5388abaee..86152ec3b8879a2dcf6eb41f85fa1cd746f5cb00 100644 (file)
--- a/net/rds/iw_send.c
+++ b/net/rds/iw_send.c
@@ -153,9 +153,10 @@ void rds_iw_send_init_ring(struct rds_iw_connection *ic)
                sge->length = sizeof(struct rds_header);
                sge->lkey = 0;
 
-               send->s_mr = ib_alloc_fast_reg_mr(ic->i_pd, fastreg_message_size);
+               send->s_mr = ib_alloc_mr(ic->i_pd, IB_MR_TYPE_MEM_REG,
+                                        fastreg_message_size);
                if (IS_ERR(send->s_mr)) {
-                       printk(KERN_WARNING "RDS/IW: ib_alloc_fast_reg_mr failed\n");
+                       printk(KERN_WARNING "RDS/IW: ib_alloc_mr failed\n");
                        break;
                }