1 files changed, 1 insertions, 1 deletions

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 5013d04b41fd..272e1881b5f8 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -699,7 +699,7 @@ void __ext4_abort(struct super_block *sb, const char *function,
                         jbd2_journal_abort(EXT4_SB(sb)->s_journal, -EIO);
                 save_error_info(sb, function, line);
         }
-        if (test_opt(sb, ERRORS_PANIC)) {
+        if (test_opt(sb, ERRORS_PANIC) && !system_going_down()) {
                 if (EXT4_SB(sb)->s_journal &&
                   !(EXT4_SB(sb)->s_journal->j_flags & JBD2_REC_ERR))
                         return;