iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RDS: Fix assertion level from fatal to warning

Browse Source 
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>
This commit is contained in:
santosh.shilimkar@oracle.com 2015-08-22 15:45:31 -07:00 committed by David S. Miller
parent 3049147ca7
commit 5c240fa2ab
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/rds/ib_rdma.c
View File

@ -490,7 +490,7 @@ static void __rds_ib_teardown_mr(struct rds_ib_mr *ibmr)
/* FIXME we need a way to tell a r/w MR /* FIXME we need a way to tell a r/w MR
* from a r/o MR */ * from a r/o MR */
BUG_ON(irqs_disabled()); WARN_ON(!page->mapping && irqs_disabled());
set_page_dirty(page); set_page_dirty(page);
put_page(page); put_page(page);
} }

2
net/rds/rdma.c
View File

@ -451,7 +451,7 @@ void rds_rdma_free_op(struct rm_rdma_op *ro)
* is the case for a RDMA_READ which copies from remote * is the case for a RDMA_READ which copies from remote
* to local memory */ * to local memory */
if (!ro->op_write) { if (!ro->op_write) {
BUG_ON(irqs_disabled()); WARN_ON(!page->mapping && irqs_disabled());
set_page_dirty(page); set_page_dirty(page);
} }
put_page(page); put_page(page);