From: Andy Grover <andy.grover@oracle.com>
Date: Sat, 13 Mar 2010 00:22:32 +0000 (-0800)
Subject: RDS: Fix BUG_ONs to not fire when in a tasklet
X-Git-Tag: v2.6.37-rc1~147^2~499^2~106
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=9e2effba2c16fc3bd47da605116485afe01e0be0;p=net-next-2.6.git

RDS: Fix BUG_ONs to not fire when in a tasklet

in_interrupt() is true in softirqs. The BUG_ONs are supposed
to check for if irqs are disabled, so we should use
BUG_ON(irqs_disabled()) instead, duh.

Signed-off-by: Andy Grover <andy.grover@oracle.com>
---

diff --git a/net/rds/ib_rdma.c b/net/rds/ib_rdma.c
index a54cd63f9e3..a92aebcb7fc 100644
--- a/net/rds/ib_rdma.c
+++ b/net/rds/ib_rdma.c
@@ -441,7 +441,7 @@ static void __rds_ib_teardown_mr(struct rds_ib_mr *ibmr)
 
 			/* FIXME we need a way to tell a r/w MR
 			 * from a r/o MR */
-			BUG_ON(in_interrupt());
+			BUG_ON(irqs_disabled());
 			set_page_dirty(page);
 			put_page(page);
 		}
diff --git a/net/rds/rdma.c b/net/rds/rdma.c
index 75fd13bb631..3b442d4d64c 100644
--- a/net/rds/rdma.c
+++ b/net/rds/rdma.c
@@ -440,7 +440,7 @@ void rds_rdma_free_op(struct rds_rdma_op *ro)
 		 * is the case for a RDMA_READ which copies from remote
 		 * to local memory */
 		if (!ro->r_write) {
-			BUG_ON(in_interrupt());
+			BUG_ON(irqs_disabled());
 			set_page_dirty(page);
 		}
 		put_page(page);