aboutsummaryrefslogtreecommitdiffstats
path: root/net/rds
diff options
context:
space:
mode:
authorsantosh.shilimkar@oracle.com <santosh.shilimkar@oracle.com>2015-08-22 18:45:31 -0400
committerDavid S. Miller <davem@davemloft.net>2015-08-25 16:35:31 -0400
commit5c240fa2ab394af1dbde280e00cc038cbc7f0409 (patch)
treea4aabec1e817018704250e52b374941f4c375c59 /net/rds
parent3049147ca7c8426268433d16d7546a51dede316d (diff)
RDS: Fix assertion level from fatal to warning
Fix the asserion level since its not fatal and can be hit in normal execution paths. There is no need to take the system down. We keep the WARN_ON() to detect the condition if we get here with bad pages. Reviewed-by: Ajaykumar Hotchandani <ajaykumar.hotchandani@oracle.com> Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rds')
-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 e49c9568b4a5..7b7aac8cdb56 100644
--- a/net/rds/ib_rdma.c
+++ b/net/rds/ib_rdma.c
@@ -490,7 +490,7 @@ static void __rds_ib_teardown_mr(struct rds_ib_mr *ibmr)
490 490
491 /* FIXME we need a way to tell a r/w MR 491 /* FIXME we need a way to tell a r/w MR
492 * from a r/o MR */ 492 * from a r/o MR */
493 BUG_ON(irqs_disabled()); 493 WARN_ON(!page->mapping && irqs_disabled());
494 set_page_dirty(page); 494 set_page_dirty(page);
495 put_page(page); 495 put_page(page);
496 } 496 }
diff --git a/net/rds/rdma.c b/net/rds/rdma.c
index 6401b501a215..c1df9b1cf3b2 100644
--- a/net/rds/rdma.c
+++ b/net/rds/rdma.c
@@ -451,7 +451,7 @@ void rds_rdma_free_op(struct rm_rdma_op *ro)
451 * is the case for a RDMA_READ which copies from remote 451 * is the case for a RDMA_READ which copies from remote
452 * to local memory */ 452 * to local memory */
453 if (!ro->op_write) { 453 if (!ro->op_write) {
454 BUG_ON(irqs_disabled()); 454 WARN_ON(!page->mapping && irqs_disabled());
455 set_page_dirty(page); 455 set_page_dirty(page);
456 } 456 }
457 put_page(page); 457 put_page(page);