Update bcachefs sources to 6a20aede29 bcachefs: Fix quotas + snapshots

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

diff --git a/libbcachefs/backpointers.c b/libbcachefs/backpointers.c
index a3a1ed6e596819bbdb530ee70d14a8a2e781fc74..e9ae623cf4a8145fd8dc148565f21235976866ec 100644 (file)
--- a/libbcachefs/backpointers.c
+++ b/libbcachefs/backpointers.c
@@ -43,11 +43,6 @@ int bch2_backpointer_invalid(const struct bch_fs *c, struct bkey_s_c k,
        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 -BCH_ERR_invalid_bkey;
-       }
-
        if (!bpos_eq(bp.k->p, bucket_pos_to_bp(c, bucket, bp.v->bucket_offset))) {
                prt_str(err, "backpointer at wrong pos");
                return -BCH_ERR_invalid_bkey;
@@ -163,12 +158,11 @@ int bch2_bucket_backpointer_mod_nowritebuffer(struct btree_trans *trans,
                set_bkey_val_u64s(&bp_k->k, 0);
        }
 
-       bch2_trans_iter_init(trans, &bp_iter, BTREE_ID_backpointers,
-                            bp_k->k.p,
-                            BTREE_ITER_INTENT|
-                            BTREE_ITER_SLOTS|
-                            BTREE_ITER_WITH_UPDATES);
-       k = bch2_btree_iter_peek_slot(&bp_iter);
+       k = bch2_bkey_get_iter(trans, &bp_iter, BTREE_ID_backpointers,
+                              bp_k->k.p,
+                              BTREE_ITER_INTENT|
+                              BTREE_ITER_SLOTS|
+                              BTREE_ITER_WITH_UPDATES);
        ret = bkey_err(k);
        if (ret)
                goto err;
@@ -207,9 +201,8 @@ int bch2_get_next_backpointer(struct btree_trans *trans,
                goto done;
 
        if (gen >= 0) {
-               bch2_trans_iter_init(trans, &alloc_iter, BTREE_ID_alloc,
-                                    bucket, BTREE_ITER_CACHED|iter_flags);
-               k = bch2_btree_iter_peek_slot(&alloc_iter);
+               k = bch2_bkey_get_iter(trans, &alloc_iter, BTREE_ID_alloc,
+                                      bucket, BTREE_ITER_CACHED|iter_flags);
                ret = bkey_err(k);
                if (ret)
                        goto out;
@@ -386,10 +379,8 @@ static int bch2_check_btree_backpointer(struct btree_trans *trans, struct btree_
 
        ca = bch_dev_bkey_exists(c, k.k->p.inode);
 
-       bch2_trans_iter_init(trans, &alloc_iter, BTREE_ID_alloc,
-                            bp_pos_to_bucket(c, k.k->p), 0);
-
-       alloc_k = bch2_btree_iter_peek_slot(&alloc_iter);
+       alloc_k = bch2_bkey_get_iter(trans, &alloc_iter, BTREE_ID_alloc,
+                                    bp_pos_to_bucket(c, k.k->p), 0);
        ret = bkey_err(alloc_k);
        if (ret)
                goto out;
@@ -447,10 +438,9 @@ static int check_bp_exists(struct btree_trans *trans,
        if (!bch2_dev_bucket_exists(c, bucket))
                goto missing;
 
-       bch2_trans_iter_init(trans, &bp_iter, BTREE_ID_backpointers,
-                            bucket_pos_to_bp(c, bucket, bp.bucket_offset),
-                            0);
-       bp_k = bch2_btree_iter_peek_slot(&bp_iter);
+       bp_k = bch2_bkey_get_iter(trans, &bp_iter, BTREE_ID_backpointers,
+                                 bucket_pos_to_bp(c, bucket, bp.bucket_offset),
+                                 0);
        ret = bkey_err(bp_k);
        if (ret)
                goto err;