Update bcachefs sources to 7250b2ee5574 bcachefs: Fix deleted inodes btree in snapsho...

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

diff --git a/libbcachefs/backpointers.h b/libbcachefs/backpointers.h
index ded1ab7fb0bc0e1dad331e01f1539427dea3bf3d..4ab9f3562912de16a3e41f3baefa8645e9b2323c 100644 (file)
--- a/libbcachefs/backpointers.h
+++ b/libbcachefs/backpointers.h
@@ -7,8 +7,8 @@
 #include "buckets.h"
 #include "super.h"
 
-int bch2_backpointer_invalid(const struct bch_fs *, struct bkey_s_c k,
-                            unsigned, struct printbuf *);
+int bch2_backpointer_invalid(struct bch_fs *, struct bkey_s_c k,
+                            enum bkey_invalid_flags, struct printbuf *);
 void bch2_backpointer_to_text(struct printbuf *, const struct bch_backpointer *);
 void bch2_backpointer_k_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
 void bch2_backpointer_swab(struct bkey_s);
@@ -17,6 +17,7 @@ void bch2_backpointer_swab(struct bkey_s);
        .key_invalid    = bch2_backpointer_invalid,     \
        .val_to_text    = bch2_backpointer_k_to_text,   \
        .swab           = bch2_backpointer_swab,        \
+       .min_val_size   = 32,                           \
 })
 
 #define MAX_EXTENT_COMPRESS_RATIO_SHIFT                10
@@ -48,21 +49,16 @@ static inline struct bpos bucket_pos_to_bp(const struct bch_fs *c,
                  (bucket_to_sector(ca, bucket.offset) <<
                   MAX_EXTENT_COMPRESS_RATIO_SHIFT) + bucket_offset);
 
-       BUG_ON(!bkey_eq(bucket, bp_pos_to_bucket(c, ret)));
+       EBUG_ON(!bkey_eq(bucket, bp_pos_to_bucket(c, ret)));
 
        return ret;
 }
 
-bool bch2_bucket_backpointer_del(struct btree_trans *,
-                               struct bkey_i_alloc_v4 *,
-                               struct bch_backpointer);
-
-int bch2_bucket_backpointer_mod_nowritebuffer(struct btree_trans *,
-                               struct bkey_i_alloc_v4 *,
+int bch2_bucket_backpointer_mod_nowritebuffer(struct btree_trans *, struct bkey_i_backpointer *,
                                struct bch_backpointer, struct bkey_s_c, bool);
 
 static inline int bch2_bucket_backpointer_mod(struct btree_trans *trans,
-                               struct bkey_i_alloc_v4 *a,
+                               struct bpos bucket,
                                struct bch_backpointer bp,
                                struct bkey_s_c orig_k,
                                bool insert)
@@ -71,21 +67,13 @@ static inline int bch2_bucket_backpointer_mod(struct btree_trans *trans,
        struct bkey_i_backpointer *bp_k;
        int ret;
 
-       if (!insert &&
-           unlikely(BCH_ALLOC_V4_NR_BACKPOINTERS(&a->v)) &&
-           bch2_bucket_backpointer_del(trans, a, bp))
-               return 0;
-
-       if (unlikely(bch2_backpointers_no_use_write_buffer))
-               return bch2_bucket_backpointer_mod_nowritebuffer(trans, a, bp, orig_k, insert);
-
        bp_k = bch2_trans_kmalloc_nomemzero(trans, sizeof(struct bkey_i_backpointer));
        ret = PTR_ERR_OR_ZERO(bp_k);
        if (ret)
                return ret;
 
        bkey_backpointer_init(&bp_k->k_i);
-       bp_k->k.p = bucket_pos_to_bp(c, a->k.p, bp.bucket_offset);
+       bp_k->k.p = bucket_pos_to_bp(c, bucket, bp.bucket_offset);
        bp_k->v = bp;
 
        if (!insert) {
@@ -93,15 +81,26 @@ static inline int bch2_bucket_backpointer_mod(struct btree_trans *trans,
                set_bkey_val_u64s(&bp_k->k, 0);
        }
 
+       if (unlikely(bch2_backpointers_no_use_write_buffer))
+               return bch2_bucket_backpointer_mod_nowritebuffer(trans, bp_k, bp, orig_k, insert);
+
        return bch2_trans_update_buffered(trans, BTREE_ID_backpointers, &bp_k->k_i);
 }
 
+static inline enum bch_data_type bkey_ptr_data_type(enum btree_id btree_id, unsigned level,
+                                                   struct bkey_s_c k, struct extent_ptr_decoded p)
+{
+       return  level           ? BCH_DATA_btree :
+               p.has_ec        ? BCH_DATA_stripe :
+                                 BCH_DATA_user;
+}
+
 static inline 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;
+       enum bch_data_type data_type = bkey_ptr_data_type(btree_id, level, k, p);
        s64 sectors = level ? btree_sectors(c) : k.k->size;
        u32 bucket_offset;
 
@@ -118,11 +117,12 @@ static inline void bch2_extent_ptr_to_bp(struct bch_fs *c,
 }
 
 int bch2_get_next_backpointer(struct btree_trans *, struct bpos, int,
-                             u64 *, struct bch_backpointer *, unsigned);
+                             struct bpos *, struct bch_backpointer *, unsigned);
 struct bkey_s_c bch2_backpointer_get_key(struct btree_trans *, struct btree_iter *,
-                                        struct bpos, u64, struct bch_backpointer);
+                                        struct bpos, struct bch_backpointer,
+                                        unsigned);
 struct btree *bch2_backpointer_get_node(struct btree_trans *, struct btree_iter *,
-                                       struct bpos, u64, struct bch_backpointer);
+                                       struct bpos, struct bch_backpointer);
 
 int bch2_check_btree_backpointers(struct bch_fs *);
 int bch2_check_extents_to_backpointers(struct bch_fs *);