diff options
| author | Jan Kara <jack@suse.cz> | 2025-02-06 10:46:59 +0100 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2025-03-17 11:19:41 -0400 |
| commit | a662f3c03b754e1f97a2781fa242e95bdb139798 (patch) | |
| tree | 5f19cd9e6ec639f30491b5c009163192f9182dd2 | |
| parent | e6eff39dd0fe4190c6146069cc16d160e71d1148 (diff) | |
| download | linux-stable-a662f3c03b754e1f97a2781fa242e95bdb139798.tar.gz linux-stable-a662f3c03b754e1f97a2781fa242e95bdb139798.tar.bz2 linux-stable-a662f3c03b754e1f97a2781fa242e95bdb139798.zip | |
jbd2: do not try to recover wiped journal
If a journal is wiped, we will set journal->j_tail to 0. However if
'write' argument is not set (as it happens for read-only device or for
ocfs2), the on-disk superblock is not updated accordingly and thus
jbd2_journal_recover() cat try to recover the wiped journal. Fix the
check in jbd2_journal_recover() to use journal->j_tail for checking
empty journal instead.
Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Zhang Yi <yi.zhang@huawei.com>
Link: https://patch.msgid.link/20250206094657.20865-4-jack@suse.cz
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | fs/jbd2/recovery.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c index 38a89a3310b2..c271a050b7e6 100644 --- a/fs/jbd2/recovery.c +++ b/fs/jbd2/recovery.c @@ -282,19 +282,20 @@ static int fc_do_one_pass(journal_t *journal, int jbd2_journal_recover(journal_t *journal) { int err, err2; - journal_superblock_t * sb; - struct recovery_info info; memset(&info, 0, sizeof(info)); - sb = journal->j_superblock; /* * The journal superblock's s_start field (the current log head) * is always zero if, and only if, the journal was cleanly - * unmounted. + * unmounted. We use its in-memory version j_tail here because + * jbd2_journal_wipe() could have updated it without updating journal + * superblock. */ - if (!sb->s_start) { + if (!journal->j_tail) { + journal_superblock_t *sb = journal->j_superblock; + jbd2_debug(1, "No recovery required, last transaction %d, head block %u\n", be32_to_cpu(sb->s_sequence), be32_to_cpu(sb->s_head)); journal->j_transaction_sequence = be32_to_cpu(sb->s_sequence) + 1; |