UBUNTU: Ubuntu-4.15.0-96.97

[mirror_ubuntu-bionic-kernel.git] / fs / xfs / xfs_message.c

diff --git a/fs/xfs/xfs_message.c b/fs/xfs/xfs_message.c
index 11792d888e4e707b91a528390deadbf212417e8e..e68bd1050eab53fca672d8afd5444d7b62cfcfbf 100644 (file)
--- a/fs/xfs/xfs_message.c
+++ b/fs/xfs/xfs_message.c
@@ -110,7 +110,10 @@ assfail(char *expr, char *file, int line)
 {
        xfs_emerg(NULL, "Assertion failed: %s, file: %s, line: %d",
                expr, file, line);
-       BUG();
+       if (xfs_globals.bug_on_assert)
+               BUG();
+       else
+               WARN_ON(1);
 }
 
 void