RDS: adjust BUG()s for irqs disabled.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
Signed-off-by: Bang Nguyen <bang.nguyen@oracle.com>

diff --git a/net/rds/ib_rdma.c b/net/rds/ib_rdma.c
index 60286d27690896fb3bacf8d63e01f398a4992173..6917322e0cd0ff34e60a9634825cbc423c105168 100644 (file)
--- a/net/rds/ib_rdma.c
+++ b/net/rds/ib_rdma.c
@@ -498,7 +498,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(irqs_disabled());
+                       WARN_ON_ONCE(page_mapping(page) && irqs_disabled());
                        set_page_dirty(page);
                        put_page(page);
                }

diff --git a/net/rds/rdma.c b/net/rds/rdma.c
index 6f50702abce10e59b6ac1a86afb6deac46cdd69e..484ecfaaabf12036c4a76e14b39be4c6fbe01fbb 100644 (file)
--- a/net/rds/rdma.c
+++ b/net/rds/rdma.c
@@ -449,7 +449,7 @@ void rds_rdma_free_op(struct rm_rdma_op *ro)
                 * is the case for a RDMA_READ which copies from remote
                 * to local memory */
                if (!ro->op_write) {
-                       BUG_ON(irqs_disabled());
+                       WARN_ON_ONCE(page_mapping(page) && irqs_disabled());
                        set_page_dirty(page);
                }
                put_page(page);