ext4, jbd2: ensure panic when aborting with zero errno

commit 51f57b01e4a3c7d7bdceffd84de35144e8c538e7 upstream.

JBD2_REC_ERR flag used to indicate the errno has been updated when jbd2
aborted, and then __ext4_abort() and ext4_handle_error() can invoke
panic if ERRORS_PANIC is specified. But if the journal has been aborted
with zero errno, jbd2_journal_abort() didn't set this flag so we can
no longer panic. Fix this by always record the proper errno in the
journal superblock.

Fixes: 4327ba52afd03 ("ext4, jbd2: ensure entering into panic after recording an error in superblock")
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20191204124614.45424-3-yi.zhang@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
index d4c7e470dec8cc36f20fb9c4705d88f6da1e5991..7c3244cafd4337ef008709cdaf76dd48e7b1d1c3 100644 (file)
--- a/fs/jbd2/checkpoint.c
+++ b/fs/jbd2/checkpoint.c
@@ -173,7 +173,7 @@ void __jbd2_log_wait_for_space(journal_t *journal)
                                       "journal space in %s\n", __func__,
                                       journal->j_devname);
                                WARN_ON(1);
-                               jbd2_journal_abort(journal, 0);
+                               jbd2_journal_abort(journal, -EIO);
                        }
                        write_lock(&journal->j_state_lock);
                } else {

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 28b09048282e6e8990da9c8cf4d076747146e932..633e94f1a41f3d45f09c99682463f0d1abc93e00 100644 (file)
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -2106,12 +2106,10 @@ static void __journal_abort_soft (journal_t *journal, int errno)
 
        __jbd2_journal_abort_hard(journal);
 
-       if (errno) {
-               jbd2_journal_update_sb_errno(journal);
-               write_lock(&journal->j_state_lock);
-               journal->j_flags |= JBD2_REC_ERR;
-               write_unlock(&journal->j_state_lock);
-       }
+       jbd2_journal_update_sb_errno(journal);
+       write_lock(&journal->j_state_lock);
+       journal->j_flags |= JBD2_REC_ERR;
+       write_unlock(&journal->j_state_lock);
 }
 
 /**
@@ -2153,11 +2151,6 @@ static void __journal_abort_soft (journal_t *journal, int errno)
  * failure to disk.  ext3_error, for example, now uses this
  * functionality.
  *
- * Errors which originate from within the journaling layer will NOT
- * supply an errno; a null errno implies that absolutely no further
- * writes are done to the journal (unless there are any already in
- * progress).
- *
  */
 
 void jbd2_journal_abort(journal_t *journal, int errno)