summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2022-04-21 00:34:58 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2022-04-21 13:19:16 -0400
commitb48f44d69fe425991ec49046a8490a2ce85786c7 (patch)
tree1148ae147353c67cdf88167bea481c721f3dda78
parent2db3f2c51b10e90dfd37dd3f2cb5839c08713882 (diff)
bcachefs: Fix journal_iters_fix()
journal_iters_fix() was incorrectly rewinding iterators past keys they had already returned, leading to those keys being double counted in the bch2_gc() path - oops. Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
-rw-r--r--fs/bcachefs/recovery.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c
index 17860e7b7372..2e67e921fd9d 100644
--- a/fs/bcachefs/recovery.c
+++ b/fs/bcachefs/recovery.c
@@ -147,7 +147,7 @@ static void journal_iters_fix(struct bch_fs *c)
/*
* If an iterator points one after the key we just inserted,
- * and the key we just inserted compares >= the iterator's position,
+ * and the key we just inserted compares > the iterator's position,
* decrement the iterator so it points at the key we just inserted:
*/
list_for_each_entry(iter, &c->journal_iters, journal.list)
@@ -155,7 +155,7 @@ static void journal_iters_fix(struct bch_fs *c)
iter->last &&
iter->b->c.btree_id == n->btree_id &&
iter->b->c.level == n->level &&
- bpos_cmp(n->k->k.p, iter->unpacked.p) >= 0)
+ bpos_cmp(n->k->k.p, iter->unpacked.p) > 0)
iter->journal.idx = keys->gap - 1;
}