mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
bcachefs: Fix for cmd_list_journal
cmd_list_journal wasn't correctly listing the most recent journal entries as blacklisted - because in the recovery path when just reading the journal, we were failing to add those to the blacklist table. Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
This commit is contained in:
parent
cb685ce72c
commit
f2aa026575
1 changed files with 7 additions and 3 deletions
|
@ -1175,9 +1175,6 @@ int bch2_fs_recovery(struct bch_fs *c)
|
|||
blacklist_seq = journal_seq = le64_to_cpu(clean->journal_seq) + 1;
|
||||
}
|
||||
|
||||
if (c->opts.read_journal_only)
|
||||
goto out;
|
||||
|
||||
if (c->opts.reconstruct_alloc) {
|
||||
c->sb.compat &= ~(1ULL << BCH_COMPAT_alloc_info);
|
||||
drop_alloc_keys(&c->journal_keys);
|
||||
|
@ -1208,6 +1205,13 @@ int bch2_fs_recovery(struct bch_fs *c)
|
|||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* note: cmd_list_journal needs the blacklist table fully up to date so
|
||||
* it can asterisk ignored journal entries:
|
||||
*/
|
||||
if (c->opts.read_journal_only)
|
||||
goto out;
|
||||
|
||||
ret = bch2_fs_journal_start(&c->journal, journal_seq);
|
||||
if (ret)
|
||||
goto err;
|
||||
|
|
Loading…
Reference in a new issue