diff --git a/[refs] b/[refs] index 3213d50cf0f2..25372674ebfc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 048c15e641289d902f7ef9f1241068d8045e210c +refs/heads/master: 571c02fa81e43ebb4b793f626d6c7bf0fa18902b diff --git a/trunk/net/rds/ib_rdma.c b/trunk/net/rds/ib_rdma.c index 4b0da865a72c..65e668defe42 100644 --- a/trunk/net/rds/ib_rdma.c +++ b/trunk/net/rds/ib_rdma.c @@ -234,8 +234,8 @@ void rds_ib_destroy_mr_pool(struct rds_ib_mr_pool *pool) { flush_workqueue(rds_wq); rds_ib_flush_mr_pool(pool, 1); - BUG_ON(atomic_read(&pool->item_count)); - BUG_ON(atomic_read(&pool->free_pinned)); + WARN_ON(atomic_read(&pool->item_count)); + WARN_ON(atomic_read(&pool->free_pinned)); kfree(pool); }