rds: off by one fixes

Signed-off-by: Bang Nguyen <bang.nguyen@oracle.com>

diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
index b3eef17eaab4e176d8b591f380ae989514499066..ab8628d1a2ff0cb79e2545ed505c7681944b437b 100644 (file)
--- a/net/rds/ib_cm.c
+++ b/net/rds/ib_cm.c
@@ -508,7 +508,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn)
        else
                ic->i_rcq = ib_create_cq(dev, rds_ib_cq_comp_handler_recv,
                                        rds_ib_cq_event_handler, conn,
-                                       rds_ib_srq_max_wr - 1,
+                                       ic->i_recv_ring.w_nr,
                                        IB_CQ_VECTOR_LEAST_ATTACHED);
        if (IS_ERR(ic->i_rcq)) {
                ret = PTR_ERR(ic->i_rcq);

diff --git a/net/rds/ib_rdma.c b/net/rds/ib_rdma.c
index 2141f5759718e40be0b43baa7b9a0686c66d1309..f56380969b2ed984fcbbfa416f914fd0b076bf0a 100644 (file)
--- a/net/rds/ib_rdma.c
+++ b/net/rds/ib_rdma.c
@@ -241,10 +241,10 @@ struct rds_ib_mr_pool *rds_ib_create_mr_pool(struct rds_ib_device *rds_ibdev,
        INIT_DELAYED_WORK(&pool->flush_worker, rds_ib_mr_pool_flush_worker);
 
        if (pool_type == RDS_IB_MR_1M_POOL) {
-               pool->fmr_attr.max_pages = RDS_FMR_1M_MSG_SIZE;
+               pool->fmr_attr.max_pages = RDS_FMR_1M_MSG_SIZE + 1;
                pool->max_items = rds_ib_fmr_1m_pool_size;
        } else /* pool_type == RDS_IB_MR_8K_POOL */ {
-               pool->fmr_attr.max_pages = RDS_FMR_8K_MSG_SIZE;
+               pool->fmr_attr.max_pages = RDS_FMR_8K_MSG_SIZE + 1;
                pool->max_items = rds_ib_fmr_8k_pool_size;
        }
        pool->max_free_pinned =