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 72f797c93660ac683d1c0d59882e1bc983e71ed6..9c424340b2b12afa4af33562bd45d41af6bc016b 100644 (file)
--- a/net/rds/ib_rdma.c
+++ b/net/rds/ib_rdma.c
@@ -440,7 +440,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 13caed358c6de46e7abff60f528775646c10d3ad..79c44f88867f78e1adf7645cfd9facc8325a0b88 100644 (file)
--- a/net/rds/rdma.c
+++ b/net/rds/rdma.c
@@ -442,7 +442,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);