aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAndy Grover <andy.grover@oracle.com>2010-03-11 08:50:01 -0500
committerDavid S. Miller <davem@davemloft.net>2010-03-17 00:16:56 -0400
commit571c02fa81e43ebb4b793f626d6c7bf0fa18902b (patch)
tree08868b2379bc577d64654ea14047edd2eeaf55c7 /net
parent048c15e641289d902f7ef9f1241068d8045e210c (diff)
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>
Diffstat (limited to 'net')
-rw-r--r--net/rds/ib_rdma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rds/ib_rdma.c b/net/rds/ib_rdma.c
index 4b0da865a72c..65e668defe42 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)
234{ 234{
235 flush_workqueue(rds_wq); 235 flush_workqueue(rds_wq);
236 rds_ib_flush_mr_pool(pool, 1); 236 rds_ib_flush_mr_pool(pool, 1);
237 BUG_ON(atomic_read(&pool->item_count)); 237 WARN_ON(atomic_read(&pool->item_count));
238 BUG_ON(atomic_read(&pool->free_pinned)); 238 WARN_ON(atomic_read(&pool->free_pinned));
239 kfree(pool); 239 kfree(pool);
240} 240}
241 241