]> git.sesse.net Git - bcachefs-tools-debian/blobdiff - libbcachefs/extents.h
Update bcachefs sources to da7d42a9a2 bcachefs: Add new assertions for shutdown path
[bcachefs-tools-debian] / libbcachefs / extents.h
index 613d76af69d956c47045ddfcf6fdc098db46e64f..d359b3fda91db3a9ce3f49520e5995b8dd9d861a 100644 (file)
@@ -8,7 +8,7 @@
 
 struct bch_fs;
 struct btree_trans;
-struct btree_insert_entry;
+enum bkey_invalid_flags;
 
 /* extent entries: */
 
@@ -40,6 +40,9 @@ struct btree_insert_entry;
                (union bch_extent_entry *) (_entry));                   \
 })
 
+#define extent_entry_next(_entry)                                      \
+       ((typeof(_entry)) ((void *) (_entry) + extent_entry_bytes(_entry)))
+
 static inline unsigned
 __extent_entry_type(const union bch_extent_entry *e)
 {
@@ -74,14 +77,26 @@ static inline size_t extent_entry_u64s(const union bch_extent_entry *entry)
        return extent_entry_bytes(entry) / sizeof(u64);
 }
 
+static inline void __extent_entry_insert(struct bkey_i *k,
+                                        union bch_extent_entry *dst,
+                                        union bch_extent_entry *new)
+{
+       union bch_extent_entry *end = bkey_val_end(bkey_i_to_s(k));
+
+       memmove_u64s_up_small((u64 *) dst + extent_entry_u64s(new),
+                             dst, (u64 *) end - (u64 *) dst);
+       k->k.u64s += extent_entry_u64s(new);
+       memcpy_u64s_small(dst, new, extent_entry_u64s(new));
+}
+
 static inline bool extent_entry_is_ptr(const union bch_extent_entry *e)
 {
-       switch (extent_entry_type(e)) {
-       case BCH_EXTENT_ENTRY_ptr:
-               return true;
-       default:
-               return false;
-       }
+       return extent_entry_type(e) == BCH_EXTENT_ENTRY_ptr;
+}
+
+static inline bool extent_entry_is_stripe_ptr(const union bch_extent_entry *e)
+{
+       return extent_entry_type(e) == BCH_EXTENT_ENTRY_stripe_ptr;
 }
 
 static inline bool extent_entry_is_crc(const union bch_extent_entry *e)
@@ -140,11 +155,7 @@ bch2_extent_crc_unpack(const struct bkey *k, const union bch_extent_crc *crc)
                        common_fields(crc->crc32),
                };
 
-               *((__le32 *) &ret.csum.lo) = crc->crc32.csum;
-
-               memcpy(&ret.csum.lo, &crc->crc32.csum,
-                      sizeof(crc->crc32.csum));
-
+               memcpy(&ret.csum.lo, &crc->crc32.csum, sizeof(crc->crc32.csum));
                return ret;
        }
        case BCH_EXTENT_ENTRY_crc64: {
@@ -154,8 +165,8 @@ bch2_extent_crc_unpack(const struct bkey *k, const union bch_extent_crc *crc)
                        .csum.lo                = (__force __le64) crc->crc64.csum_lo,
                };
 
-               *((__le16 *) &ret.csum.hi) = crc->crc64.csum_hi;
-
+               u16 hi = crc->crc64.csum_hi;
+               memcpy(&ret.csum.hi, &hi, sizeof(hi));
                return ret;
        }
        case BCH_EXTENT_ENTRY_crc128: {
@@ -173,6 +184,12 @@ bch2_extent_crc_unpack(const struct bkey *k, const union bch_extent_crc *crc)
 #undef common_fields
 }
 
+static inline bool crc_is_compressed(struct bch_extent_crc_unpacked crc)
+{
+       return (crc.compression_type != BCH_COMPRESSION_TYPE_none &&
+               crc.compression_type != BCH_COMPRESSION_TYPE_incompressible);
+}
+
 /* bkey_ptrs: generically over any key type that has ptrs */
 
 struct bkey_ptrs_c {
@@ -185,10 +202,63 @@ struct bkey_ptrs {
        union bch_extent_entry  *end;
 };
 
-/* iterate over bkey ptrs */
+static inline struct bkey_ptrs_c bch2_bkey_ptrs_c(struct bkey_s_c k)
+{
+       switch (k.k->type) {
+       case KEY_TYPE_btree_ptr: {
+               struct bkey_s_c_btree_ptr e = bkey_s_c_to_btree_ptr(k);
 
-#define extent_entry_next(_entry)                                      \
-       ((typeof(_entry)) ((void *) (_entry) + extent_entry_bytes(_entry)))
+               return (struct bkey_ptrs_c) {
+                       to_entry(&e.v->start[0]),
+                       to_entry(extent_entry_last(e))
+               };
+       }
+       case KEY_TYPE_extent: {
+               struct bkey_s_c_extent e = bkey_s_c_to_extent(k);
+
+               return (struct bkey_ptrs_c) {
+                       e.v->start,
+                       extent_entry_last(e)
+               };
+       }
+       case KEY_TYPE_stripe: {
+               struct bkey_s_c_stripe s = bkey_s_c_to_stripe(k);
+
+               return (struct bkey_ptrs_c) {
+                       to_entry(&s.v->ptrs[0]),
+                       to_entry(&s.v->ptrs[s.v->nr_blocks]),
+               };
+       }
+       case KEY_TYPE_reflink_v: {
+               struct bkey_s_c_reflink_v r = bkey_s_c_to_reflink_v(k);
+
+               return (struct bkey_ptrs_c) {
+                       r.v->start,
+                       bkey_val_end(r),
+               };
+       }
+       case KEY_TYPE_btree_ptr_v2: {
+               struct bkey_s_c_btree_ptr_v2 e = bkey_s_c_to_btree_ptr_v2(k);
+
+               return (struct bkey_ptrs_c) {
+                       to_entry(&e.v->start[0]),
+                       to_entry(extent_entry_last(e))
+               };
+       }
+       default:
+               return (struct bkey_ptrs_c) { NULL, NULL };
+       }
+}
+
+static inline struct bkey_ptrs bch2_bkey_ptrs(struct bkey_s k)
+{
+       struct bkey_ptrs_c p = bch2_bkey_ptrs_c(k.s_c);
+
+       return (struct bkey_ptrs) {
+               (void *) p.start,
+               (void *) p.end
+       };
+}
 
 #define __bkey_extent_entry_for_each_from(_start, _end, _entry)                \
        for ((_entry) = (_start);                                       \
@@ -228,7 +298,7 @@ struct bkey_ptrs {
        __label__ out;                                                  \
                                                                        \
        (_ptr).idx      = 0;                                            \
-       (_ptr).ec_nr    = 0;                                            \
+       (_ptr).has_ec   = false;                                        \
                                                                        \
        __bkey_extent_entry_for_each_from(_entry, _end, _entry)         \
                switch (extent_entry_type(_entry)) {                    \
@@ -242,7 +312,11 @@ struct bkey_ptrs {
                                        entry_to_crc(_entry));          \
                        break;                                          \
                case BCH_EXTENT_ENTRY_stripe_ptr:                       \
-                       (_ptr).ec[(_ptr).ec_nr++] = _entry->stripe_ptr; \
+                       (_ptr).ec = _entry->stripe_ptr;                 \
+                       (_ptr).has_ec   = true;                         \
+                       break;                                          \
+               default:                                                \
+                       /* nothing */                                   \
                        break;                                          \
                }                                                       \
 out:                                                                   \
@@ -280,96 +354,26 @@ out:                                                                      \
 #define bkey_for_each_crc(_k, _p, _crc, _iter)                         \
        __bkey_for_each_crc(_k, (_p).start, (_p).end, _crc, _iter)
 
-/* utility code common to all keys with pointers: */
-
-static inline struct bkey_ptrs_c bch2_bkey_ptrs_c(struct bkey_s_c k)
-{
-       switch (k.k->type) {
-       case KEY_TYPE_btree_ptr: {
-               struct bkey_s_c_btree_ptr e = bkey_s_c_to_btree_ptr(k);
-               return (struct bkey_ptrs_c) {
-                       to_entry(&e.v->start[0]),
-                       to_entry(extent_entry_last(e))
-               };
-       }
-       case KEY_TYPE_extent: {
-               struct bkey_s_c_extent e = bkey_s_c_to_extent(k);
-               return (struct bkey_ptrs_c) {
-                       e.v->start,
-                       extent_entry_last(e)
-               };
-       }
-       case KEY_TYPE_stripe: {
-               struct bkey_s_c_stripe s = bkey_s_c_to_stripe(k);
-               return (struct bkey_ptrs_c) {
-                       to_entry(&s.v->ptrs[0]),
-                       to_entry(&s.v->ptrs[s.v->nr_blocks]),
-               };
-       }
-       case KEY_TYPE_reflink_v: {
-               struct bkey_s_c_reflink_v r = bkey_s_c_to_reflink_v(k);
-
-               return (struct bkey_ptrs_c) {
-                       r.v->start,
-                       bkey_val_end(r),
-               };
-       }
-       default:
-               return (struct bkey_ptrs_c) { NULL, NULL };
-       }
-}
-
-static inline struct bkey_ptrs bch2_bkey_ptrs(struct bkey_s k)
-{
-       struct bkey_ptrs_c p = bch2_bkey_ptrs_c(k.s_c);
-
-       return (struct bkey_ptrs) {
-               (void *) p.start,
-               (void *) p.end
-       };
-}
-
-static inline struct bch_devs_list bch2_bkey_devs(struct bkey_s_c k)
-{
-       struct bch_devs_list ret = (struct bch_devs_list) { 0 };
-       struct bkey_ptrs_c p = bch2_bkey_ptrs_c(k);
-       const struct bch_extent_ptr *ptr;
+/* Iterate over pointers in KEY_TYPE_extent: */
 
-       bkey_for_each_ptr(p, ptr)
-               ret.devs[ret.nr++] = ptr->dev;
-
-       return ret;
-}
-
-static inline struct bch_devs_list bch2_bkey_dirty_devs(struct bkey_s_c k)
-{
-       struct bch_devs_list ret = (struct bch_devs_list) { 0 };
-       struct bkey_ptrs_c p = bch2_bkey_ptrs_c(k);
-       const struct bch_extent_ptr *ptr;
-
-       bkey_for_each_ptr(p, ptr)
-               if (!ptr->cached)
-                       ret.devs[ret.nr++] = ptr->dev;
+#define extent_for_each_entry_from(_e, _entry, _start)                 \
+       __bkey_extent_entry_for_each_from(_start,                       \
+                               extent_entry_last(_e), _entry)
 
-       return ret;
-}
+#define extent_for_each_entry(_e, _entry)                              \
+       extent_for_each_entry_from(_e, _entry, (_e).v->start)
 
-static inline struct bch_devs_list bch2_bkey_cached_devs(struct bkey_s_c k)
-{
-       struct bch_devs_list ret = (struct bch_devs_list) { 0 };
-       struct bkey_ptrs_c p = bch2_bkey_ptrs_c(k);
-       const struct bch_extent_ptr *ptr;
+#define extent_ptr_next(_e, _ptr)                                      \
+       __bkey_ptr_next(_ptr, extent_entry_last(_e))
 
-       bkey_for_each_ptr(p, ptr)
-               if (ptr->cached)
-                       ret.devs[ret.nr++] = ptr->dev;
+#define extent_for_each_ptr(_e, _ptr)                                  \
+       __bkey_for_each_ptr(&(_e).v->start->ptr, extent_entry_last(_e), _ptr)
 
-       return ret;
-}
+#define extent_for_each_ptr_decode(_e, _ptr, _entry)                   \
+       __bkey_for_each_ptr_decode((_e).k, (_e).v->start,               \
+                                  extent_entry_last(_e), _ptr, _entry)
 
-unsigned bch2_bkey_nr_ptrs(struct bkey_s_c);
-unsigned bch2_bkey_nr_dirty_ptrs(struct bkey_s_c);
-unsigned bch2_bkey_durability(struct bch_fs *, struct bkey_s_c);
+/* utility code common to all keys with pointers: */
 
 void bch2_mark_io_failure(struct bch_io_failures *,
                          struct extent_ptr_decoded *);
@@ -377,87 +381,93 @@ int bch2_bkey_pick_read_device(struct bch_fs *, struct bkey_s_c,
                               struct bch_io_failures *,
                               struct extent_ptr_decoded *);
 
-void bch2_bkey_append_ptr(struct bkey_i *, struct bch_extent_ptr);
-void bch2_bkey_drop_device(struct bkey_s, unsigned);
-const struct bch_extent_ptr *bch2_bkey_has_device(struct bkey_s_c, unsigned);
-bool bch2_bkey_has_target(struct bch_fs *, struct bkey_s_c, unsigned);
-
-void bch2_bkey_ptrs_to_text(struct printbuf *, struct bch_fs *,
-                           struct bkey_s_c);
-const char *bch2_bkey_ptrs_invalid(const struct bch_fs *, struct bkey_s_c);
-
-/* bch_btree_ptr: */
+/* KEY_TYPE_btree_ptr: */
 
-const char *bch2_btree_ptr_invalid(const struct bch_fs *, struct bkey_s_c);
-void bch2_btree_ptr_debugcheck(struct bch_fs *, struct bkey_s_c);
+int bch2_btree_ptr_invalid(const struct bch_fs *, struct bkey_s_c,
+                          enum bkey_invalid_flags, struct printbuf *);
 void bch2_btree_ptr_to_text(struct printbuf *, struct bch_fs *,
                            struct bkey_s_c);
-void bch2_ptr_swab(const struct bkey_format *, struct bkey_packed *);
 
-#define bch2_bkey_ops_btree_ptr (struct bkey_ops) {            \
+int bch2_btree_ptr_v2_invalid(const struct bch_fs *, struct bkey_s_c,
+                             enum bkey_invalid_flags, struct printbuf *);
+void bch2_btree_ptr_v2_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
+void bch2_btree_ptr_v2_compat(enum btree_id, unsigned, unsigned,
+                             int, struct bkey_s);
+
+#define bch2_bkey_ops_btree_ptr ((struct bkey_ops) {           \
        .key_invalid    = bch2_btree_ptr_invalid,               \
-       .key_debugcheck = bch2_btree_ptr_debugcheck,            \
        .val_to_text    = bch2_btree_ptr_to_text,               \
        .swab           = bch2_ptr_swab,                        \
-}
+       .trans_trigger  = bch2_trans_mark_extent,               \
+       .atomic_trigger = bch2_mark_extent,                     \
+})
+
+#define bch2_bkey_ops_btree_ptr_v2 ((struct bkey_ops) {                \
+       .key_invalid    = bch2_btree_ptr_v2_invalid,            \
+       .val_to_text    = bch2_btree_ptr_v2_to_text,            \
+       .swab           = bch2_ptr_swab,                        \
+       .compat         = bch2_btree_ptr_v2_compat,             \
+       .trans_trigger  = bch2_trans_mark_extent,               \
+       .atomic_trigger = bch2_mark_extent,                     \
+       .min_val_size   = 40,                                   \
+})
 
-/* bch_extent: */
+/* KEY_TYPE_extent: */
 
-const char *bch2_extent_invalid(const struct bch_fs *, struct bkey_s_c);
-void bch2_extent_debugcheck(struct bch_fs *, struct bkey_s_c);
-void bch2_extent_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
-bool bch2_extent_normalize(struct bch_fs *, struct bkey_s);
-enum merge_result bch2_extent_merge(struct bch_fs *,
-                                   struct bkey_s, struct bkey_s);
+bool bch2_extent_merge(struct bch_fs *, struct bkey_s, struct bkey_s_c);
 
-#define bch2_bkey_ops_extent (struct bkey_ops) {               \
-       .key_invalid    = bch2_extent_invalid,                  \
-       .key_debugcheck = bch2_extent_debugcheck,               \
-       .val_to_text    = bch2_extent_to_text,                  \
+#define bch2_bkey_ops_extent ((struct bkey_ops) {              \
+       .key_invalid    = bch2_bkey_ptrs_invalid,               \
+       .val_to_text    = bch2_bkey_ptrs_to_text,               \
        .swab           = bch2_ptr_swab,                        \
        .key_normalize  = bch2_extent_normalize,                \
        .key_merge      = bch2_extent_merge,                    \
-}
+       .trans_trigger  = bch2_trans_mark_extent,               \
+       .atomic_trigger = bch2_mark_extent,                     \
+})
 
-/* bch_reservation: */
+/* KEY_TYPE_reservation: */
 
-const char *bch2_reservation_invalid(const struct bch_fs *, struct bkey_s_c);
+int bch2_reservation_invalid(const struct bch_fs *, struct bkey_s_c,
+                            enum bkey_invalid_flags, struct printbuf *);
 void bch2_reservation_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
-enum merge_result bch2_reservation_merge(struct bch_fs *,
-                                        struct bkey_s, struct bkey_s);
+bool bch2_reservation_merge(struct bch_fs *, struct bkey_s, struct bkey_s_c);
 
-#define bch2_bkey_ops_reservation (struct bkey_ops) {          \
+#define bch2_bkey_ops_reservation ((struct bkey_ops) {         \
        .key_invalid    = bch2_reservation_invalid,             \
        .val_to_text    = bch2_reservation_to_text,             \
        .key_merge      = bch2_reservation_merge,               \
-}
-
-int bch2_extent_atomic_end(struct btree_iter *, struct bkey_i *,
-                          struct bpos *);
-int bch2_extent_trim_atomic(struct bkey_i *, struct btree_iter *);
-int bch2_extent_is_atomic(struct bkey_i *, struct btree_iter *);
-
-enum btree_insert_ret
-bch2_extent_can_insert(struct btree_trans *, struct btree_insert_entry *,
-                      unsigned *);
-void bch2_insert_fixup_extent(struct btree_trans *,
-                             struct btree_insert_entry *);
+       .trans_trigger  = bch2_trans_mark_reservation,          \
+       .atomic_trigger = bch2_mark_reservation,                \
+       .min_val_size   = 8,                                    \
+})
 
-void bch2_bkey_mark_replicas_cached(struct bch_fs *, struct bkey_s,
-                                   unsigned, unsigned);
+/* Extent checksum entries: */
 
-const struct bch_extent_ptr *
-bch2_extent_has_device(struct bkey_s_c_extent, unsigned);
+bool bch2_can_narrow_extent_crcs(struct bkey_s_c,
+                                struct bch_extent_crc_unpacked);
+bool bch2_bkey_narrow_crcs(struct bkey_i *, struct bch_extent_crc_unpacked);
+void bch2_extent_crc_append(struct bkey_i *,
+                           struct bch_extent_crc_unpacked);
 
-unsigned bch2_extent_is_compressed(struct bkey_s_c);
+/* Generic code for keys with pointers: */
 
-bool bch2_bkey_matches_ptr(struct bch_fs *, struct bkey_s_c,
-                          struct bch_extent_ptr, u64);
+static inline bool bkey_is_btree_ptr(const struct bkey *k)
+{
+       switch (k->type) {
+       case KEY_TYPE_btree_ptr:
+       case KEY_TYPE_btree_ptr_v2:
+               return true;
+       default:
+               return false;
+       }
+}
 
 static inline bool bkey_extent_is_direct_data(const struct bkey *k)
 {
        switch (k->type) {
        case KEY_TYPE_btree_ptr:
+       case KEY_TYPE_btree_ptr_v2:
        case KEY_TYPE_extent:
        case KEY_TYPE_reflink_v:
                return true;
@@ -466,9 +476,35 @@ static inline bool bkey_extent_is_direct_data(const struct bkey *k)
        }
 }
 
+static inline bool bkey_extent_is_inline_data(const struct bkey *k)
+{
+       return  k->type == KEY_TYPE_inline_data ||
+               k->type == KEY_TYPE_indirect_inline_data;
+}
+
+static inline unsigned bkey_inline_data_offset(const struct bkey *k)
+{
+       switch (k->type) {
+       case KEY_TYPE_inline_data:
+               return sizeof(struct bch_inline_data);
+       case KEY_TYPE_indirect_inline_data:
+               return sizeof(struct bch_indirect_inline_data);
+       default:
+               BUG();
+       }
+}
+
+static inline unsigned bkey_inline_data_bytes(const struct bkey *k)
+{
+       return bkey_val_bytes(k) - bkey_inline_data_offset(k);
+}
+
+#define bkey_inline_data_p(_k) (((void *) (_k).v) + bkey_inline_data_offset((_k).k))
+
 static inline bool bkey_extent_is_data(const struct bkey *k)
 {
-       return bkey_extent_is_direct_data(k) ||
+       return  bkey_extent_is_direct_data(k) ||
+               bkey_extent_is_inline_data(k) ||
                k->type == KEY_TYPE_reflink_p;
 }
 
@@ -482,38 +518,144 @@ static inline bool bkey_extent_is_allocation(const struct bkey *k)
        case KEY_TYPE_reservation:
        case KEY_TYPE_reflink_p:
        case KEY_TYPE_reflink_v:
+       case KEY_TYPE_inline_data:
+       case KEY_TYPE_indirect_inline_data:
                return true;
        default:
                return false;
        }
 }
 
-/* Extent entry iteration: */
+static inline bool bkey_extent_is_unwritten(struct bkey_s_c k)
+{
+       struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);
+       const struct bch_extent_ptr *ptr;
 
-#define extent_for_each_entry_from(_e, _entry, _start)                 \
-       __bkey_extent_entry_for_each_from(_start,                       \
-                               extent_entry_last(_e),_entry)
+       bkey_for_each_ptr(ptrs, ptr)
+               if (ptr->unwritten)
+                       return true;
+       return false;
+}
 
-#define extent_for_each_entry(_e, _entry)                              \
-       extent_for_each_entry_from(_e, _entry, (_e).v->start)
+static inline bool bkey_extent_is_reservation(struct bkey_s_c k)
+{
+       return k.k->type == KEY_TYPE_reservation ||
+               bkey_extent_is_unwritten(k);
+}
 
-#define extent_ptr_next(_e, _ptr)                                      \
-       __bkey_ptr_next(_ptr, extent_entry_last(_e))
+static inline struct bch_devs_list bch2_bkey_devs(struct bkey_s_c k)
+{
+       struct bch_devs_list ret = (struct bch_devs_list) { 0 };
+       struct bkey_ptrs_c p = bch2_bkey_ptrs_c(k);
+       const struct bch_extent_ptr *ptr;
 
-#define extent_for_each_ptr(_e, _ptr)                                  \
-       __bkey_for_each_ptr(&(_e).v->start->ptr, extent_entry_last(_e), _ptr)
+       bkey_for_each_ptr(p, ptr)
+               ret.devs[ret.nr++] = ptr->dev;
 
-#define extent_for_each_ptr_decode(_e, _ptr, _entry)                   \
-       __bkey_for_each_ptr_decode((_e).k, (_e).v->start,               \
-                                  extent_entry_last(_e), _ptr, _entry)
+       return ret;
+}
 
-void bch2_extent_ptr_decoded_append(struct bkey_i *,
-                                   struct extent_ptr_decoded *);
+static inline struct bch_devs_list bch2_bkey_dirty_devs(struct bkey_s_c k)
+{
+       struct bch_devs_list ret = (struct bch_devs_list) { 0 };
+       struct bkey_ptrs_c p = bch2_bkey_ptrs_c(k);
+       const struct bch_extent_ptr *ptr;
 
-bool bch2_can_narrow_extent_crcs(struct bkey_s_c,
-                                struct bch_extent_crc_unpacked);
-bool bch2_bkey_narrow_crcs(struct bkey_i *, struct bch_extent_crc_unpacked);
+       bkey_for_each_ptr(p, ptr)
+               if (!ptr->cached)
+                       ret.devs[ret.nr++] = ptr->dev;
+
+       return ret;
+}
+
+static inline struct bch_devs_list bch2_bkey_cached_devs(struct bkey_s_c k)
+{
+       struct bch_devs_list ret = (struct bch_devs_list) { 0 };
+       struct bkey_ptrs_c p = bch2_bkey_ptrs_c(k);
+       const struct bch_extent_ptr *ptr;
+
+       bkey_for_each_ptr(p, ptr)
+               if (ptr->cached)
+                       ret.devs[ret.nr++] = ptr->dev;
+
+       return ret;
+}
 
+static inline unsigned bch2_bkey_ptr_data_type(struct bkey_s_c k, const struct bch_extent_ptr *ptr)
+{
+       switch (k.k->type) {
+       case KEY_TYPE_btree_ptr:
+       case KEY_TYPE_btree_ptr_v2:
+               return BCH_DATA_btree;
+       case KEY_TYPE_extent:
+       case KEY_TYPE_reflink_v:
+               return BCH_DATA_user;
+       case KEY_TYPE_stripe: {
+               struct bkey_s_c_stripe s = bkey_s_c_to_stripe(k);
+
+               BUG_ON(ptr < s.v->ptrs ||
+                      ptr >= s.v->ptrs + s.v->nr_blocks);
+
+               return ptr >= s.v->ptrs + s.v->nr_blocks - s.v->nr_redundant
+                       ? BCH_DATA_parity
+                       : BCH_DATA_user;
+       }
+       default:
+               BUG();
+       }
+}
+
+unsigned bch2_bkey_nr_ptrs(struct bkey_s_c);
+unsigned bch2_bkey_nr_ptrs_allocated(struct bkey_s_c);
+unsigned bch2_bkey_nr_ptrs_fully_allocated(struct bkey_s_c);
+bool bch2_bkey_is_incompressible(struct bkey_s_c);
+unsigned bch2_bkey_sectors_compressed(struct bkey_s_c);
+
+unsigned bch2_bkey_replicas(struct bch_fs *, struct bkey_s_c);
+unsigned bch2_extent_ptr_desired_durability(struct bch_fs *, struct extent_ptr_decoded *);
+unsigned bch2_extent_ptr_durability(struct bch_fs *, struct extent_ptr_decoded *);
+unsigned bch2_bkey_durability(struct bch_fs *, struct bkey_s_c);
+
+void bch2_bkey_drop_device(struct bkey_s, unsigned);
+void bch2_bkey_drop_device_noerror(struct bkey_s, unsigned);
+
+const struct bch_extent_ptr *bch2_bkey_has_device_c(struct bkey_s_c, unsigned);
+
+static inline struct bch_extent_ptr *bch2_bkey_has_device(struct bkey_s k, unsigned dev)
+{
+       return (void *) bch2_bkey_has_device_c(k.s_c, dev);
+}
+
+bool bch2_bkey_has_target(struct bch_fs *, struct bkey_s_c, unsigned);
+
+void bch2_bkey_extent_entry_drop(struct bkey_i *, union bch_extent_entry *);
+
+static inline void bch2_bkey_append_ptr(struct bkey_i *k, struct bch_extent_ptr ptr)
+{
+       EBUG_ON(bch2_bkey_has_device(bkey_i_to_s(k), ptr.dev));
+
+       switch (k->k.type) {
+       case KEY_TYPE_btree_ptr:
+       case KEY_TYPE_btree_ptr_v2:
+       case KEY_TYPE_extent:
+               EBUG_ON(bkey_val_u64s(&k->k) >= BKEY_EXTENT_VAL_U64s_MAX);
+
+               ptr.type = 1 << BCH_EXTENT_ENTRY_ptr;
+
+               memcpy((void *) &k->v + bkey_val_bytes(&k->k),
+                      &ptr,
+                      sizeof(ptr));
+               k->k.u64s++;
+               break;
+       default:
+               BUG();
+       }
+}
+
+void bch2_extent_ptr_decoded_append(struct bkey_i *,
+                                   struct extent_ptr_decoded *);
+union bch_extent_entry *bch2_bkey_drop_ptr_noerror(struct bkey_s,
+                                                  struct bch_extent_ptr *);
 union bch_extent_entry *bch2_bkey_drop_ptr(struct bkey_s,
                                           struct bch_extent_ptr *);
 
@@ -534,14 +676,53 @@ do {                                                                      \
        }                                                               \
 } while (0)
 
-void __bch2_cut_front(struct bpos, struct bkey_s);
+bool bch2_bkey_matches_ptr(struct bch_fs *, struct bkey_s_c,
+                          struct bch_extent_ptr, u64);
+bool bch2_extents_match(struct bkey_s_c, struct bkey_s_c);
+struct bch_extent_ptr *
+bch2_extent_has_ptr(struct bkey_s_c, struct extent_ptr_decoded, struct bkey_s);
+
+void bch2_extent_ptr_set_cached(struct bkey_s, struct bch_extent_ptr *);
+
+bool bch2_extent_normalize(struct bch_fs *, struct bkey_s);
+void bch2_bkey_ptrs_to_text(struct printbuf *, struct bch_fs *,
+                           struct bkey_s_c);
+int bch2_bkey_ptrs_invalid(const struct bch_fs *, struct bkey_s_c,
+                          unsigned, struct printbuf *);
+
+void bch2_ptr_swab(struct bkey_s);
+
+/* Generic extent code: */
+
+enum bch_extent_overlap {
+       BCH_EXTENT_OVERLAP_ALL          = 0,
+       BCH_EXTENT_OVERLAP_BACK         = 1,
+       BCH_EXTENT_OVERLAP_FRONT        = 2,
+       BCH_EXTENT_OVERLAP_MIDDLE       = 3,
+};
+
+/* Returns how k overlaps with m */
+static inline enum bch_extent_overlap bch2_extent_overlap(const struct bkey *k,
+                                                         const struct bkey *m)
+{
+       int cmp1 = bkey_lt(k->p, m->p);
+       int cmp2 = bkey_gt(bkey_start_pos(k), bkey_start_pos(m));
+
+       return (cmp1 << 1) + cmp2;
+}
+
+int bch2_cut_front_s(struct bpos, struct bkey_s);
+int bch2_cut_back_s(struct bpos, struct bkey_s);
 
 static inline void bch2_cut_front(struct bpos where, struct bkey_i *k)
 {
-       __bch2_cut_front(where, bkey_i_to_s(k));
+       bch2_cut_front_s(where, bkey_i_to_s(k));
 }
 
-bool bch2_cut_back(struct bpos, struct bkey *);
+static inline void bch2_cut_back(struct bpos where, struct bkey_i *k)
+{
+       bch2_cut_back_s(where, bkey_i_to_s(k));
+}
 
 /**
  * bch_key_resize - adjust size of @k
@@ -573,7 +754,4 @@ static inline void extent_save(struct btree *b, struct bkey_packed *dst,
                BUG_ON(!bch2_bkey_pack_key(dst, src, f));
 }
 
-bool bch2_check_range_allocated(struct bch_fs *, struct bpos, u64, unsigned);
-unsigned bch2_bkey_nr_ptrs_allocated(struct bkey_s_c);
-
 #endif /* _BCACHEFS_EXTENTS_H */