summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Grover <andy.grover@oracle.com>2010-03-12 16:22:32 -0800
committerAndy Grover <andy.grover@oracle.com>2010-09-08 18:07:31 -0700
commit9e2effba2c16fc3bd47da605116485afe01e0be0 (patch)
treea423d21a3abee4a5979ce13f7627d81e558c32ed
parentdb40980fcdb560d7992b0511df16cdd3f7e381f3 (diff)
downloadop-kernel-dev-9e2effba2c16fc3bd47da605116485afe01e0be0.zip
op-kernel-dev-9e2effba2c16fc3bd47da605116485afe01e0be0.tar.gz
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>
-rw-r--r--net/rds/ib_rdma.c2
-rw-r--r--net/rds/rdma.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/rds/ib_rdma.c b/net/rds/ib_rdma.c
index a54cd63..a92aebc 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 75fd13b..3b442d4 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);
OpenPOWER on IntegriCloud