ext4, jbd2: ensure panic when aborting with zero errno
[ Upstream commit51f57b01e4
] 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:4327ba52af
("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: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
8343f165f3
commit
494c30b805
|
@ -164,7 +164,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 {
|
||||
|
|
|
@ -2123,12 +2123,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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -2170,11 +2168,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)
|
||||
|
|
Loading…
Reference in New Issue