diff options
| author |   Theodore Ts'o <tytso@mit.edu> | 2018-02-19 12:22:53 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2018-02-19 12:22:53 -0500 |
| commit | 85e0c4e89c1b864e763c4e3bb15d0b6d501ad5d9 (patch) | |
| tree | 898f1f3c8e3be76f24d4ef3a7fe0ed482c6f374b /fs/jbd2 | |
| parent | ext4: pass -ESHUTDOWN code to jbd2 layer (diff) | |
| download | linux-dev-85e0c4e89c1b864e763c4e3bb15d0b6d501ad5d9.tar.xz linux-dev-85e0c4e89c1b864e763c4e3bb15d0b6d501ad5d9.zip | |
jbd2: if the journal is aborted then don't allow update of the log tail
This updates the jbd2 superblock unnecessarily, and on an abort we
shouldn't truncate the log.
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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index efa0c72a0b9f..dfb057900e79 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -974,7 +974,7 @@ out: } /* - * This is a variaon of __jbd2_update_log_tail which checks for validity of + * This is a variation of __jbd2_update_log_tail which checks for validity of * provided log tail and locks j_checkpoint_mutex. So it is safe against races * with other threads updating log tail. */ @@ -1417,6 +1417,9 @@ int jbd2_journal_update_sb_log_tail(journal_t *journal, tid_t tail_tid, journal_superblock_t *sb = journal->j_superblock; int ret; + if (is_journal_aborted(journal)) + return -EIO; + BUG_ON(!mutex_is_locked(&journal->j_checkpoint_mutex)); jbd_debug(1, "JBD2: updating superblock (start %lu, seq %u)\n", tail_block, tail_tid); |