diff options
author | Daeho Jeong <daeho.jeong@samsung.com> | 2015-10-18 17:02:56 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2015-10-18 17:02:56 -0400 |
commit | 4327ba52afd03fc4b5afa0ee1d774c9c5b0e85c5 (patch) | |
tree | 586491d92df3043ec5ddd0beaa92bd7cda77ae3d /fs/jbd2 | |
parent | 904dad4742d211b7a8910e92695c0fa957483836 (diff) | |
download | linux-stable-4327ba52afd03fc4b5afa0ee1d774c9c5b0e85c5.tar.gz linux-stable-4327ba52afd03fc4b5afa0ee1d774c9c5b0e85c5.tar.bz2 linux-stable-4327ba52afd03fc4b5afa0ee1d774c9c5b0e85c5.zip |
ext4, jbd2: ensure entering into panic after recording an error in superblock
If a EXT4 filesystem utilizes JBD2 journaling and an error occurs, the
journaling will be aborted first and the error number will be recorded
into JBD2 superblock and, finally, the system will enter into the
panic state in "errors=panic" option. But, in the rare case, this
sequence is little twisted like the below figure and it will happen
that the system enters into panic state, which means the system reset
in mobile environment, before completion of recording an error in the
journal superblock. In this case, e2fsck cannot recognize that the
filesystem failure occurred in the previous run and the corruption
wouldn't be fixed.
Task A Task B
ext4_handle_error()
-> jbd2_journal_abort()
-> __journal_abort_soft()
-> __jbd2_journal_abort_hard()
| -> journal->j_flags |= JBD2_ABORT;
|
| __ext4_abort()
| -> jbd2_journal_abort()
| | -> __journal_abort_soft()
| | -> if (journal->j_flags & JBD2_ABORT)
| | return;
| -> panic()
|
-> jbd2_journal_update_sb_errno()
Tested-by: Hobin Woo <hobin.woo@samsung.com>
Signed-off-by: Daeho Jeong <daeho.jeong@samsung.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@vger.kernel.org
Diffstat (limited to 'fs/jbd2')
-rw-r--r-- | fs/jbd2/journal.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index eb8a7546e8a4..81e622681c82 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -2072,8 +2072,12 @@ static void __journal_abort_soft (journal_t *journal, int errno) __jbd2_journal_abort_hard(journal); - if (errno) + 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); + } } /** |