summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2020-03-25 17:59:36 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2020-03-25 17:59:36 -0400
commit2aed686c235a7d08adf601f147f823eb62e697a1 (patch)
treed39c1a33cd0e8dc7534569030d7ca1622c917811
parent2dbedd962bc923f43ea546f19d9b5240ea3c9d95 (diff)
Update bcachefs sources to 96b991466a bcachefs: Improve error message in fsck
-rw-r--r--.bcachefs_revision2
-rw-r--r--libbcachefs/recovery.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/.bcachefs_revision b/.bcachefs_revision
index 4600d638..9bf45e9e 100644
--- a/.bcachefs_revision
+++ b/.bcachefs_revision
@@ -1 +1 @@
-76f72a0cc7392f83567b3f477496d6efe8a98f6b
+96b991466ac851ea3c7adbd2e30184837573e2a0
diff --git a/libbcachefs/recovery.c b/libbcachefs/recovery.c
index 320fea2b..5f27b840 100644
--- a/libbcachefs/recovery.c
+++ b/libbcachefs/recovery.c
@@ -449,7 +449,8 @@ static int bch2_journal_replay(struct bch_fs *c,
sort(keys.d, keys.nr, sizeof(keys.d[0]), journal_sort_seq_cmp, NULL);
- replay_now_at(j, keys.journal_seq_base);
+ if (keys.nr)
+ replay_now_at(j, keys.journal_seq_base);
for_each_journal_key(keys, i) {
if (!i->level)