Update bcachefs sources to 2115a2ffde bcachefs: Kill bch2_verify_bucket_evacuated()

[bcachefs-tools-debian] / libbcachefs / alloc_foreground.c

diff --git a/libbcachefs/alloc_foreground.c b/libbcachefs/alloc_foreground.c
index d52f30ac66bad2f536df6a99cac1f45af2de48d3..350635f3b118b31c1d203e909b7616b9789babc3 100644 (file)
--- a/libbcachefs/alloc_foreground.c
+++ b/libbcachefs/alloc_foreground.c
@@ -345,17 +345,17 @@ static struct open_bucket *try_alloc_bucket(struct btree_trans *trans, struct bc
 
        if (!test_bit(BCH_FS_CHECK_BACKPOINTERS_DONE, &c->flags)) {
                struct bch_backpointer bp;
-               u64 bp_offset = 0;
+               struct bpos bp_pos = POS_MIN;
 
                ret = bch2_get_next_backpointer(trans, POS(ca->dev_idx, b), -1,
-                                               &bp_offset, &bp,
+                                               &bp_pos, &bp,
                                                BTREE_ITER_NOPRESERVE);
                if (ret) {
                        ob = ERR_PTR(ret);
                        goto err;
                }
 
-               if (bp_offset != U64_MAX) {
+               if (!bkey_eq(bp_pos, POS_MAX)) {
                        /*
                         * Bucket may have data in it - we don't call
                         * bc2h_trans_inconnsistent() because fsck hasn't