diff options
author | Kent Overstreet <kent.overstreet@linux.dev> | 2022-12-01 11:20:40 -0500 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@linux.dev> | 2022-12-01 11:20:40 -0500 |
commit | f82cd58008706da43dd652dd9191511f2786d15d (patch) | |
tree | ac17f8b87c2a1ce747c94b0ebf807bc344c5e270 /libbcachefs/recovery.c | |
parent | 0c98cd7bf6617468f08b2d01a4313c0f1b7f0f03 (diff) |
Update bcachefs sources to f1c9030ccb bcachefs: Don't error out when just reading the journal
Diffstat (limited to 'libbcachefs/recovery.c')
-rw-r--r-- | libbcachefs/recovery.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libbcachefs/recovery.c b/libbcachefs/recovery.c index 7906e817..af2628f4 100644 --- a/libbcachefs/recovery.c +++ b/libbcachefs/recovery.c @@ -1118,6 +1118,13 @@ int bch2_fs_recovery(struct bch_fs *c) if (ret) goto err; + /* + * 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; + genradix_for_each_reverse(&c->journal_entries, iter, i) if (*i && !(*i)->ignore) { last_journal_entry = &(*i)->j; @@ -1189,13 +1196,6 @@ use_clean: } } - /* - * 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; |