From 099989c1b230e0f36ee7146d1df948822c999f6a Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Thu, 21 Apr 2022 00:34:58 -0400 Subject: 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 --- fs/bcachefs/recovery.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fs/bcachefs/recovery.c') diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c index 5831ab53a982..f54859b49416 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; } -- cgit