]> git.sesse.net Git - bcachefs-tools-debian/blobdiff - libbcachefs/backpointers.c
Update bcachefs sources to 1b14994029 bcachefs: Fragmentation LRU
[bcachefs-tools-debian] / libbcachefs / backpointers.c
index dace68e208b670aa05cc3a4400155cac4a385967..e001f41916713d44df03e944c1dc0ab23e4d2ed5 100644 (file)
@@ -5,65 +5,11 @@
 #include "backpointers.h"
 #include "btree_cache.h"
 #include "btree_update.h"
+#include "btree_write_buffer.h"
 #include "error.h"
 
 #include <linux/mm.h>
 
-#define MAX_EXTENT_COMPRESS_RATIO_SHIFT                10
-
-/*
- * Convert from pos in backpointer btree to pos of corresponding bucket in alloc
- * btree:
- */
-static inline struct bpos bp_pos_to_bucket(const struct bch_fs *c,
-                                          struct bpos bp_pos)
-{
-       struct bch_dev *ca = bch_dev_bkey_exists(c, bp_pos.inode);
-       u64 bucket_sector = bp_pos.offset >> MAX_EXTENT_COMPRESS_RATIO_SHIFT;
-
-       return POS(bp_pos.inode, sector_to_bucket(ca, bucket_sector));
-}
-
-/*
- * Convert from pos in alloc btree + bucket offset to pos in backpointer btree:
- */
-static inline struct bpos bucket_pos_to_bp(const struct bch_fs *c,
-                                          struct bpos bucket,
-                                          u64 bucket_offset)
-{
-       struct bch_dev *ca = bch_dev_bkey_exists(c, bucket.inode);
-       struct bpos ret;
-
-       ret = POS(bucket.inode,
-                 (bucket_to_sector(ca, bucket.offset) <<
-                  MAX_EXTENT_COMPRESS_RATIO_SHIFT) + bucket_offset);
-
-       BUG_ON(bkey_cmp(bucket, bp_pos_to_bucket(c, ret)));
-
-       return ret;
-}
-
-void bch2_extent_ptr_to_bp(struct bch_fs *c,
-                          enum btree_id btree_id, unsigned level,
-                          struct bkey_s_c k, struct extent_ptr_decoded p,
-                          struct bpos *bucket_pos, struct bch_backpointer *bp)
-{
-       enum bch_data_type data_type = level ? BCH_DATA_btree : BCH_DATA_user;
-       s64 sectors = level ? btree_sectors(c) : k.k->size;
-       u32 bucket_offset;
-
-       *bucket_pos = PTR_BUCKET_POS_OFFSET(c, &p.ptr, &bucket_offset);
-       *bp = (struct bch_backpointer) {
-               .btree_id       = btree_id,
-               .level          = level,
-               .data_type      = data_type,
-               .bucket_offset  = ((u64) bucket_offset << MAX_EXTENT_COMPRESS_RATIO_SHIFT) +
-                       p.crc.offset,
-               .bucket_len     = ptr_disk_sectors(sectors, p),
-               .pos            = k.k->p,
-       };
-}
-
 static bool extent_matches_bp(struct bch_fs *c,
                              enum btree_id btree_id, unsigned level,
                              struct bkey_s_c k,
@@ -83,7 +29,7 @@ static bool extent_matches_bp(struct bch_fs *c,
 
                bch2_extent_ptr_to_bp(c, btree_id, level, k, p,
                                      &bucket2, &bp2);
-               if (!bpos_cmp(bucket, bucket2) &&
+               if (bpos_eq(bucket, bucket2) &&
                    !memcmp(&bp, &bp2, sizeof(bp)))
                        return true;
        }
@@ -92,19 +38,19 @@ static bool extent_matches_bp(struct bch_fs *c,
 }
 
 int bch2_backpointer_invalid(const struct bch_fs *c, struct bkey_s_c k,
-                            int rw, struct printbuf *err)
+                            unsigned flags, struct printbuf *err)
 {
        struct bkey_s_c_backpointer bp = bkey_s_c_to_backpointer(k);
        struct bpos bucket = bp_pos_to_bucket(c, bp.k->p);
 
        if (bkey_val_bytes(bp.k) < sizeof(*bp.v)) {
                prt_str(err, "incorrect value size");
-               return -EINVAL;
+               return -BCH_ERR_invalid_bkey;
        }
 
-       if (bpos_cmp(bp.k->p, bucket_pos_to_bp(c, bucket, bp.v->bucket_offset))) {
+       if (!bpos_eq(bp.k->p, bucket_pos_to_bp(c, bucket, bp.v->bucket_offset))) {
                prt_str(err, "backpointer at wrong pos");
-               return -EINVAL;
+               return -BCH_ERR_invalid_bkey;
        }
 
        return 0;
@@ -223,48 +169,53 @@ err:
        return ret;
 }
 
-int bch2_bucket_backpointer_del(struct btree_trans *trans,
-                               struct bkey_i_alloc_v4 *a,
-                               struct bch_backpointer bp,
-                               struct bkey_s_c orig_k)
+bool bch2_bucket_backpointer_del(struct btree_trans *trans,
+                                struct bkey_i_alloc_v4 *a,
+                                struct bch_backpointer bp)
 {
-       struct bch_fs *c = trans->c;
        struct bch_backpointer *bps = alloc_v4_backpointers(&a->v);
        unsigned i, nr = BCH_ALLOC_V4_NR_BACKPOINTERS(&a->v);
-       struct btree_iter bp_iter;
-       struct bkey_s_c k;
-       int ret;
 
        for (i = 0; i < nr; i++) {
                int cmp = backpointer_cmp(bps[i], bp) ?:
                        memcmp(&bps[i], &bp, sizeof(bp));
-               if (!cmp)
-                       goto found;
+               if (!cmp) {
+                       array_remove_item(bps, nr, i);
+                       SET_BCH_ALLOC_V4_NR_BACKPOINTERS(&a->v, nr);
+                       set_alloc_v4_u64s(a);
+                       return true;
+               }
                if (cmp >= 0)
                        break;
        }
 
-       goto btree;
-found:
-       array_remove_item(bps, nr, i);
-       SET_BCH_ALLOC_V4_NR_BACKPOINTERS(&a->v, nr);
-       set_alloc_v4_u64s(a);
-       return 0;
-btree:
-       bch2_trans_iter_init(trans, &bp_iter, BTREE_ID_backpointers,
-                            bucket_pos_to_bp(c, a->k.p, bp.bucket_offset),
-                            BTREE_ITER_INTENT|
-                            BTREE_ITER_SLOTS|
-                            BTREE_ITER_WITH_UPDATES);
-       k = bch2_btree_iter_peek_slot(&bp_iter);
-       ret = bkey_err(k);
-       if (ret)
-               goto err;
+       return false;
+}
+
+static noinline int backpointer_mod_err(struct btree_trans *trans,
+                                       struct bch_backpointer bp,
+                                       struct bkey_s_c bp_k,
+                                       struct bkey_s_c orig_k,
+                                       bool insert)
+{
+       struct bch_fs *c = trans->c;
+       struct printbuf buf = PRINTBUF;
 
-       if (k.k->type != KEY_TYPE_backpointer ||
-           memcmp(bkey_s_c_to_backpointer(k).v, &bp, sizeof(bp))) {
-               struct printbuf buf = PRINTBUF;
+       if (insert) {
+               prt_printf(&buf, "existing backpointer found when inserting ");
+               bch2_backpointer_to_text(&buf, &bp);
+               prt_newline(&buf);
+               printbuf_indent_add(&buf, 2);
 
+               prt_printf(&buf, "found ");
+               bch2_bkey_val_to_text(&buf, c, bp_k);
+               prt_newline(&buf);
+
+               prt_printf(&buf, "for ");
+               bch2_bkey_val_to_text(&buf, c, orig_k);
+
+               bch_err(c, "%s", buf.buf);
+       } else if (test_bit(BCH_FS_CHECK_BACKPOINTERS_DONE, &c->flags)) {
                prt_printf(&buf, "backpointer not found when deleting");
                prt_newline(&buf);
                printbuf_indent_add(&buf, 2);
@@ -274,101 +225,53 @@ btree:
                prt_newline(&buf);
 
                prt_printf(&buf, "got ");
-               bch2_bkey_val_to_text(&buf, c, k);
-               prt_newline(&buf);
-
-               prt_str(&buf, "alloc ");
-               bch2_bkey_val_to_text(&buf, c, bkey_i_to_s_c(&a->k_i));
+               bch2_bkey_val_to_text(&buf, c, bp_k);
                prt_newline(&buf);
 
                prt_printf(&buf, "for ");
                bch2_bkey_val_to_text(&buf, c, orig_k);
 
-               if (!test_bit(BCH_FS_CHECK_BACKPOINTERS_DONE, &c->flags)) {
-                       bch_err(c, "%s", buf.buf);
-               } else {
-                       ret = -EIO;
-                       bch2_trans_inconsistent(trans, "%s", buf.buf);
-               }
-               printbuf_exit(&buf);
-               goto err;
+               bch_err(c, "%s", buf.buf);
        }
 
-       ret = bch2_btree_delete_at(trans, &bp_iter, 0);
-err:
-       bch2_trans_iter_exit(trans, &bp_iter);
-       return ret;
+       printbuf_exit(&buf);
+
+       if (test_bit(BCH_FS_CHECK_BACKPOINTERS_DONE, &c->flags)) {
+               bch2_inconsistent_error(c);
+               return -EIO;
+       } else {
+               return 0;
+       }
 }
 
-int bch2_bucket_backpointer_add(struct btree_trans *trans,
+int bch2_bucket_backpointer_mod_nowritebuffer(struct btree_trans *trans,
                                struct bkey_i_alloc_v4 *a,
                                struct bch_backpointer bp,
-                               struct bkey_s_c orig_k)
+                               struct bkey_s_c orig_k,
+                               bool insert)
 {
        struct bch_fs *c = trans->c;
-       struct bch_dev *ca;
-       struct bch_backpointer *bps = alloc_v4_backpointers(&a->v);
-       unsigned i, nr = BCH_ALLOC_V4_NR_BACKPOINTERS(&a->v);
        struct bkey_i_backpointer *bp_k;
        struct btree_iter bp_iter;
        struct bkey_s_c k;
        int ret;
 
-       /* Check for duplicates: */
-       for (i = 0; i < nr; i++) {
-               int cmp = backpointer_cmp(bps[i], bp);
-               if (cmp >= 0)
-                       break;
-       }
-
-       if ((i &&
-            (bps[i - 1].bucket_offset +
-             bps[i - 1].bucket_len > bp.bucket_offset)) ||
-           (i < nr &&
-            (bp.bucket_offset + bp.bucket_len > bps[i].bucket_offset))) {
-               struct printbuf buf = PRINTBUF;
-
-               prt_printf(&buf, "overlapping backpointer found when inserting ");
-               bch2_backpointer_to_text(&buf, &bp);
-               prt_newline(&buf);
-               printbuf_indent_add(&buf, 2);
-
-               prt_printf(&buf, "into ");
-               bch2_bkey_val_to_text(&buf, c, bkey_i_to_s_c(&a->k_i));
-               prt_newline(&buf);
-
-               prt_printf(&buf, "for ");
-               bch2_bkey_val_to_text(&buf, c, orig_k);
-
-               if (!test_bit(BCH_FS_CHECK_BACKPOINTERS_DONE, &c->flags))
-                       bch_err(c, "%s", buf.buf);
-               else {
-                       bch2_trans_inconsistent(trans, "%s", buf.buf);
-                       printbuf_exit(&buf);
-                       return -EIO;
-               }
-       }
-
-       if (nr < BCH_ALLOC_V4_NR_BACKPOINTERS_MAX) {
-               array_insert_item(bps, nr, i, bp);
-               SET_BCH_ALLOC_V4_NR_BACKPOINTERS(&a->v, nr);
-               set_alloc_v4_u64s(a);
-               return 0;
-       }
-
-       /* Overflow: use backpointer btree */
-       bp_k = bch2_trans_kmalloc(trans, sizeof(*bp_k));
+       bp_k = bch2_trans_kmalloc_nomemzero(trans, sizeof(struct bkey_i_backpointer));
        ret = PTR_ERR_OR_ZERO(bp_k);
        if (ret)
                return ret;
 
-       ca = bch_dev_bkey_exists(c, a->k.p.inode);
-
        bkey_backpointer_init(&bp_k->k_i);
        bp_k->k.p = bucket_pos_to_bp(c, a->k.p, bp.bucket_offset);
        bp_k->v = bp;
 
-       bch2_trans_iter_init(trans, &bp_iter, BTREE_ID_backpointers, bp_k->k.p,
+       if (!insert) {
+               bp_k->k.type = KEY_TYPE_deleted;
+               set_bkey_val_u64s(&bp_k->k, 0);
+       }
+
+       bch2_trans_iter_init(trans, &bp_iter, BTREE_ID_backpointers,
+                            bucket_pos_to_bp(c, a->k.p, bp.bucket_offset),
                             BTREE_ITER_INTENT|
                             BTREE_ITER_SLOTS|
                             BTREE_ITER_WITH_UPDATES);
@@ -377,29 +280,13 @@ int bch2_bucket_backpointer_add(struct btree_trans *trans,
        if (ret)
                goto err;
 
-       if (k.k->type) {
-               struct printbuf buf = PRINTBUF;
-
-               prt_printf(&buf, "existing btree backpointer key found when inserting ");
-               bch2_backpointer_to_text(&buf, &bp);
-               prt_newline(&buf);
-               printbuf_indent_add(&buf, 2);
-
-               prt_printf(&buf, "found ");
-               bch2_bkey_val_to_text(&buf, c, k);
-               prt_newline(&buf);
-
-               prt_printf(&buf, "for ");
-               bch2_bkey_val_to_text(&buf, c, orig_k);
-
-               if (!test_bit(BCH_FS_CHECK_BACKPOINTERS_DONE, &c->flags))
-                       bch_err(c, "%s", buf.buf);
-               else {
-                       bch2_trans_inconsistent(trans, "%s", buf.buf);
-                       printbuf_exit(&buf);
-                       ret = -EIO;
+       if (insert
+           ? k.k->type
+           : (k.k->type != KEY_TYPE_backpointer ||
+              memcmp(bkey_s_c_to_backpointer(k).v, &bp, sizeof(bp)))) {
+               ret = backpointer_mod_err(trans, bp, k, orig_k, insert);
+               if (ret)
                        goto err;
-               }
        }
 
        ret = bch2_trans_update(trans, &bp_iter, &bp_k->k_i, 0);
@@ -457,7 +344,7 @@ int bch2_get_next_backpointer(struct btree_trans *trans,
 
        for_each_btree_key_norestart(trans, bp_iter, BTREE_ID_backpointers,
                                     bp_pos, 0, k, ret) {
-               if (bpos_cmp(k.k->p, bp_end_pos) >= 0)
+               if (bpos_ge(k.k->p, bp_end_pos))
                        break;
 
                if (k.k->type != KEY_TYPE_backpointer)
@@ -485,6 +372,9 @@ static void backpointer_not_found(struct btree_trans *trans,
        struct bch_fs *c = trans->c;
        struct printbuf buf = PRINTBUF;
 
+       if (likely(!bch2_backpointers_no_use_write_buffer))
+               return;
+
        prt_printf(&buf, "backpointer doesn't match %s it points to:\n  ",
                   thing_it_points_to);
        prt_printf(&buf, "bucket: ");
@@ -540,27 +430,30 @@ struct bkey_s_c bch2_backpointer_get_key(struct btree_trans *trans,
 
        bch2_trans_iter_exit(trans, iter);
 
-       if (bp.level) {
-               struct btree *b;
-
-               /*
-                * If a backpointer for a btree node wasn't found, it may be
-                * because it was overwritten by a new btree node that hasn't
-                * been written out yet - backpointer_get_node() checks for
-                * this:
-                */
-               b = bch2_backpointer_get_node(trans, iter, bucket, bp_offset, bp);
-               if (!IS_ERR_OR_NULL(b))
-                       return bkey_i_to_s_c(&b->key);
-
-               bch2_trans_iter_exit(trans, iter);
+       if (unlikely(bch2_backpointers_no_use_write_buffer)) {
+               if (bp.level) {
+                       struct btree *b;
+
+                       /*
+                        * If a backpointer for a btree node wasn't found, it may be
+                        * because it was overwritten by a new btree node that hasn't
+                        * been written out yet - backpointer_get_node() checks for
+                        * this:
+                        */
+                       b = bch2_backpointer_get_node(trans, iter, bucket, bp_offset, bp);
+                       if (!IS_ERR_OR_NULL(b))
+                               return bkey_i_to_s_c(&b->key);
+
+                       bch2_trans_iter_exit(trans, iter);
+
+                       if (IS_ERR(b))
+                               return bkey_s_c_err(PTR_ERR(b));
+                       return bkey_s_c_null;
+               }
 
-               if (IS_ERR(b))
-                       return bkey_s_c_err(PTR_ERR(b));
-               return bkey_s_c_null;
+               backpointer_not_found(trans, bucket, bp_offset, bp, k, "extent");
        }
 
-       backpointer_not_found(trans, bucket, bp_offset, bp, k, "extent");
        return bkey_s_c_null;
 }
 
@@ -661,7 +554,8 @@ static int check_bp_exists(struct btree_trans *trans,
                           struct bch_backpointer bp,
                           struct bkey_s_c orig_k,
                           struct bpos bucket_start,
-                          struct bpos bucket_end)
+                          struct bpos bucket_end,
+                          struct bpos *last_flushed_pos)
 {
        struct bch_fs *c = trans->c;
        struct btree_iter alloc_iter, bp_iter = { NULL };
@@ -669,8 +563,8 @@ static int check_bp_exists(struct btree_trans *trans,
        struct bkey_s_c alloc_k, bp_k;
        int ret;
 
-       if (bpos_cmp(bucket_pos, bucket_start) < 0 ||
-           bpos_cmp(bucket_pos, bucket_end) > 0)
+       if (bpos_lt(bucket_pos, bucket_start) ||
+           bpos_gt(bucket_pos, bucket_end))
                return 0;
 
        bch2_trans_iter_init(trans, &alloc_iter, BTREE_ID_alloc, bucket_pos, 0);
@@ -705,8 +599,15 @@ static int check_bp_exists(struct btree_trans *trans,
                goto err;
 
        if (bp_k.k->type != KEY_TYPE_backpointer ||
-           memcmp(bkey_s_c_to_backpointer(bp_k).v, &bp, sizeof(bp)))
+           memcmp(bkey_s_c_to_backpointer(bp_k).v, &bp, sizeof(bp))) {
+               if (!bpos_eq(*last_flushed_pos, orig_k.k->p)) {
+                       *last_flushed_pos = orig_k.k->p;
+                       ret = bch2_btree_write_buffer_flush_sync(trans) ?:
+                               -BCH_ERR_transaction_restart_write_buffer_flush;
+                       goto out;
+               }
                goto missing;
+       }
 out:
 err:
 fsck_err:
@@ -715,11 +616,12 @@ fsck_err:
        printbuf_exit(&buf);
        return ret;
 missing:
+
        prt_printf(&buf, "missing backpointer for btree=%s l=%u ",
               bch2_btree_ids[bp.btree_id], bp.level);
        bch2_bkey_val_to_text(&buf, c, orig_k);
-       prt_printf(&buf, "\nin alloc key ");
-       bch2_bkey_val_to_text(&buf, c, alloc_k);
+       prt_printf(&buf, "\nbp pos ");
+       bch2_bpos_to_text(&buf, bp_iter.pos);
 
        if (c->sb.version < bcachefs_metadata_version_backpointers ||
            c->opts.reconstruct_alloc ||
@@ -727,8 +629,7 @@ missing:
                struct bkey_i_alloc_v4 *a = bch2_alloc_to_v4_mut(trans, alloc_k);
 
                ret   = PTR_ERR_OR_ZERO(a) ?:
-                       bch2_bucket_backpointer_add(trans, a, bp, orig_k) ?:
-                       bch2_trans_update(trans, &alloc_iter, &a->k_i, 0);
+                       bch2_bucket_backpointer_mod(trans, a, bp, orig_k, true);
        }
 
        goto out;
@@ -737,7 +638,8 @@ missing:
 static int check_extent_to_backpointers(struct btree_trans *trans,
                                        struct btree_iter *iter,
                                        struct bpos bucket_start,
-                                       struct bpos bucket_end)
+                                       struct bpos bucket_end,
+                                       struct bpos *last_flushed_pos)
 {
        struct bch_fs *c = trans->c;
        struct bkey_ptrs_c ptrs;
@@ -764,7 +666,9 @@ static int check_extent_to_backpointers(struct btree_trans *trans,
                bch2_extent_ptr_to_bp(c, iter->btree_id, iter->path->level,
                                      k, p, &bucket_pos, &bp);
 
-               ret = check_bp_exists(trans, bucket_pos, bp, k, bucket_start, bucket_end);
+               ret = check_bp_exists(trans, bucket_pos, bp, k,
+                                     bucket_start, bucket_end,
+                                     last_flushed_pos);
                if (ret)
                        return ret;
        }
@@ -775,7 +679,8 @@ static int check_extent_to_backpointers(struct btree_trans *trans,
 static int check_btree_root_to_backpointers(struct btree_trans *trans,
                                            enum btree_id btree_id,
                                            struct bpos bucket_start,
-                                           struct bpos bucket_end)
+                                           struct bpos bucket_end,
+                                           struct bpos *last_flushed_pos)
 {
        struct bch_fs *c = trans->c;
        struct btree_iter iter;
@@ -807,7 +712,9 @@ static int check_btree_root_to_backpointers(struct btree_trans *trans,
                bch2_extent_ptr_to_bp(c, iter.btree_id, iter.path->level + 1,
                                      k, p, &bucket_pos, &bp);
 
-               ret = check_bp_exists(trans, bucket_pos, bp, k, bucket_start, bucket_end);
+               ret = check_bp_exists(trans, bucket_pos, bp, k,
+                                     bucket_start, bucket_end,
+                                     last_flushed_pos);
                if (ret)
                        goto err;
        }
@@ -831,7 +738,7 @@ static size_t btree_nodes_fit_in_ram(struct bch_fs *c)
 
        si_meminfo(&i);
        mem_bytes = i.totalram * i.mem_unit;
-       return (mem_bytes >> 1) / btree_bytes(c);
+       return div_u64(mem_bytes >> 1, btree_bytes(c));
 }
 
 int bch2_get_btree_in_memory_pos(struct btree_trans *trans,
@@ -887,6 +794,7 @@ static int bch2_check_extents_to_backpointers_pass(struct btree_trans *trans,
 {
        struct btree_iter iter;
        enum btree_id btree_id;
+       struct bpos last_flushed_pos = SPOS_MAX;
        int ret = 0;
 
        for (btree_id = 0; btree_id < BTREE_ID_NR; btree_id++) {
@@ -902,7 +810,8 @@ static int bch2_check_extents_to_backpointers_pass(struct btree_trans *trans,
                                        BTREE_INSERT_LAZY_RW|
                                        BTREE_INSERT_NOFAIL,
                                        check_extent_to_backpointers(trans, &iter,
-                                                               bucket_start, bucket_end));
+                                                               bucket_start, bucket_end,
+                                                               &last_flushed_pos));
                        if (ret)
                                break;
                } while (!bch2_btree_iter_advance(&iter));
@@ -916,13 +825,22 @@ static int bch2_check_extents_to_backpointers_pass(struct btree_trans *trans,
                                BTREE_INSERT_LAZY_RW|
                                BTREE_INSERT_NOFAIL,
                                check_btree_root_to_backpointers(trans, btree_id,
-                                                       bucket_start, bucket_end));
+                                                       bucket_start, bucket_end,
+                                                       &last_flushed_pos));
                if (ret)
                        break;
        }
        return ret;
 }
 
+static struct bpos bucket_pos_to_bp_safe(const struct bch_fs *c,
+                                        struct bpos bucket)
+{
+       return bch2_dev_exists2(c, bucket.inode)
+               ? bucket_pos_to_bp(c, bucket, 0)
+               : bucket;
+}
+
 int bch2_get_alloc_in_memory_pos(struct btree_trans *trans,
                                 struct bpos start, struct bpos *end)
 {
@@ -936,7 +854,7 @@ int bch2_get_alloc_in_memory_pos(struct btree_trans *trans,
        bch2_trans_node_iter_init(trans, &alloc_iter, BTREE_ID_alloc,
                                  start, 0, 1, 0);
        bch2_trans_node_iter_init(trans, &bp_iter, BTREE_ID_backpointers,
-                                 bucket_pos_to_bp(trans->c, start, 0), 0, 1, 0);
+                                 bucket_pos_to_bp_safe(trans->c, start), 0, 1, 0);
        while (1) {
                alloc_k = !alloc_end
                        ? __bch2_btree_iter_peek_and_restart(trans, &alloc_iter, 0)
@@ -957,8 +875,8 @@ int bch2_get_alloc_in_memory_pos(struct btree_trans *trans,
                        break;
                }
 
-               if (bpos_cmp(alloc_iter.pos, SPOS_MAX) &&
-                   bpos_cmp(bucket_pos_to_bp(trans->c, alloc_iter.pos, 0), bp_iter.pos) < 0) {
+               if (bpos_lt(alloc_iter.pos, SPOS_MAX) &&
+                   bpos_lt(bucket_pos_to_bp_safe(trans->c, alloc_iter.pos), bp_iter.pos)) {
                        if (!bch2_btree_iter_advance(&alloc_iter))
                                alloc_end = true;
                } else {
@@ -983,11 +901,11 @@ int bch2_check_extents_to_backpointers(struct bch_fs *c)
                if (ret)
                        break;
 
-               if (!bpos_cmp(start, POS_MIN) && bpos_cmp(end, SPOS_MAX))
+               if (bpos_eq(start, POS_MIN) && !bpos_eq(end, SPOS_MAX))
                        bch_verbose(c, "%s(): alloc info does not fit in ram, running in multiple passes with %zu nodes per pass",
                                    __func__, btree_nodes_fit_in_ram(c));
 
-               if (bpos_cmp(start, POS_MIN) || bpos_cmp(end, SPOS_MAX)) {
+               if (!bpos_eq(start, POS_MIN) || !bpos_eq(end, SPOS_MAX)) {
                        struct printbuf buf = PRINTBUF;
 
                        prt_str(&buf, "check_extents_to_backpointers(): ");
@@ -1000,7 +918,7 @@ int bch2_check_extents_to_backpointers(struct bch_fs *c)
                }
 
                ret = bch2_check_extents_to_backpointers_pass(&trans, start, end);
-               if (ret || !bpos_cmp(end, SPOS_MAX))
+               if (ret || bpos_eq(end, SPOS_MAX))
                        break;
 
                start = bpos_successor(end);