From: Dotan Barak Date: Sun, 14 Oct 2012 09:26:44 +0000 (+0200) Subject: rds: off by one fixes X-Git-Tag: v4.1.12-92~319^2^2~2^2~15 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=25f58efae2e897d2751253f9309bcbf1d4ac7c7f;p=users%2Fjedix%2Flinux-maple.git rds: off by one fixes Signed-off-by: Bang Nguyen --- diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c index b3eef17eaab4e..ab8628d1a2ff0 100644 --- 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 2141f5759718e..f56380969b2ed 100644 --- 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 =