From: Andy Grover <andy.grover@oracle.com>
Date: Thu, 11 Mar 2010 13:50:01 +0000 (+0000)
Subject: RDS: Workaround for in-use MRs on close causing crash
X-Git-Tag: v2.6.35-rc1~473^2~771
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=571c02fa81e43ebb4b793f626d6c7bf0fa18902b;p=net-next-2.6.git

RDS: Workaround for in-use MRs on close causing crash

if a machine is shut down without closing sockets properly, and
freeing all MRs, then a BUG_ON will bring it down. This patch
changes these to WARN_ONs -- leaking MRs is not fatal (although
not ideal, and there is more work to do here for a proper fix.)

Signed-off-by: Andy Grover <andy.grover@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/rds/ib_rdma.c b/net/rds/ib_rdma.c
index 4b0da865a72..65e668defe4 100644
--- a/net/rds/ib_rdma.c
+++ b/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);
 }