From a763840ed625da088ba5b4cd460eb273e2227452 Mon Sep 17 00:00:00 2001 From: Chris Mason Date: Fri, 3 Feb 2012 11:09:07 -0500 Subject: [PATCH] RDS: adjust BUG()s for irqs disabled. Signed-off-by: Chris Mason Signed-off-by: Bang Nguyen --- net/rds/ib_rdma.c | 2 +- net/rds/rdma.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/rds/ib_rdma.c b/net/rds/ib_rdma.c index 60286d276908..6917322e0cd0 100644 --- 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 6f50702abce1..484ecfaaabf1 100644 --- 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); -- 2.50.1