bcachefs: Fix for fsck spuriously finding duplicate extents

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/fsck.c b/fs/bcachefs/fsck.c
index 09ce6c29b88cf91e85a57d6c9abce4b7bf56fa5d..7449819d8eac536863a9114ab4d2cd36b4227543 100644 (file)
--- a/fs/bcachefs/fsck.c
+++ b/fs/bcachefs/fsck.c
@@ -485,7 +485,11 @@ static int check_extents(struct bch_fs *c)
                                   BTREE_ITER_INTENT);
 retry:
        for_each_btree_key_continue(iter, 0, k, ret) {
-               if (bkey_cmp(prev.k->k.p, bkey_start_pos(k.k)) > 0) {
+               /*
+                * due to retry errors we might see the same extent twice:
+                */
+               if (bkey_cmp(prev.k->k.p, k.k->p) &&
+                   bkey_cmp(prev.k->k.p, bkey_start_pos(k.k)) > 0) {
                        char buf1[200];
                        char buf2[200];