Update bcachefs sources to 0010403265 bcachefs: Fix spurious alloc errors on forced...

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

diff --git a/libbcachefs/buckets.h b/libbcachefs/buckets.h
index 5ab6f3d3413718218ddf060473f05d53ce23a3c0..a3873becbb70111b173b6c42e369e2bc5012027f 100644 (file)
--- a/libbcachefs/buckets.h
+++ b/libbcachefs/buckets.h
@@ -58,12 +58,6 @@ static inline struct bucket *bucket(struct bch_dev *ca, size_t b)
        return __bucket(ca, b, false);
 }
 
-static inline void bucket_io_clock_reset(struct bch_fs *c, struct bch_dev *ca,
-                                        size_t b, int rw)
-{
-       bucket(ca, b)->io_time[rw] = c->bucket_clock[rw].hand;
-}
-
 static inline u16 bucket_last_io(struct bch_fs *c, struct bucket *g, int rw)
 {
        return c->bucket_clock[rw].hand - g->io_time[rw];
@@ -94,6 +88,16 @@ static inline struct bucket *PTR_BUCKET(struct bch_dev *ca,
        return __bucket(ca, PTR_BUCKET_NR(ca, ptr), gc);
 }
 
+static inline enum bch_data_type ptr_data_type(const struct bkey *k,
+                                              const struct bch_extent_ptr *ptr)
+{
+       if (k->type == KEY_TYPE_btree_ptr ||
+           k->type == KEY_TYPE_btree_ptr_v2)
+               return BCH_DATA_btree;
+
+       return ptr->cached ? BCH_DATA_cached : BCH_DATA_user;
+}
+
 static inline struct bucket_mark ptr_bucket_mark(struct bch_dev *ca,
                                                 const struct bch_extent_ptr *ptr)
 {
@@ -128,8 +132,8 @@ static inline u8 ptr_stale(struct bch_dev *ca,
        return gen_after(ptr_bucket_mark(ca, ptr).gen, ptr->gen);
 }
 
-static inline unsigned __ptr_disk_sectors(struct extent_ptr_decoded p,
-                                         unsigned live_size)
+static inline s64 __ptr_disk_sectors(struct extent_ptr_decoded p,
+                                    unsigned live_size)
 {
        return live_size && p.crc.compression_type
                ? max(1U, DIV_ROUND_UP(live_size * p.crc.compressed_size,
@@ -137,7 +141,7 @@ static inline unsigned __ptr_disk_sectors(struct extent_ptr_decoded p,
                : live_size;
 }
 
-static inline unsigned ptr_disk_sectors(struct extent_ptr_decoded p)
+static inline s64 ptr_disk_sectors(struct extent_ptr_decoded p)
 {
        return __ptr_disk_sectors(p, p.crc.live_size);
 }
@@ -172,7 +176,7 @@ static inline bool bucket_needs_journal_commit(struct bucket_mark m,
 
 /* Device usage: */
 
-struct bch_dev_usage bch2_dev_usage_read(struct bch_fs *, struct bch_dev *);
+struct bch_dev_usage bch2_dev_usage_read(struct bch_dev *);
 
 void bch2_dev_usage_from_buckets(struct bch_fs *);
 
@@ -192,9 +196,9 @@ static inline u64 __dev_buckets_available(struct bch_dev *ca,
 /*
  * Number of reclaimable buckets - only for use by the allocator thread:
  */
-static inline u64 dev_buckets_available(struct bch_fs *c, struct bch_dev *ca)
+static inline u64 dev_buckets_available(struct bch_dev *ca)
 {
-       return __dev_buckets_available(ca, bch2_dev_usage_read(c, ca));
+       return __dev_buckets_available(ca, bch2_dev_usage_read(ca));
 }
 
 static inline u64 __dev_buckets_free(struct bch_dev *ca,
@@ -205,9 +209,9 @@ static inline u64 __dev_buckets_free(struct bch_dev *ca,
                fifo_used(&ca->free_inc);
 }
 
-static inline u64 dev_buckets_free(struct bch_fs *c, struct bch_dev *ca)
+static inline u64 dev_buckets_free(struct bch_dev *ca)
 {
-       return __dev_buckets_free(ca, bch2_dev_usage_read(c, ca));
+       return __dev_buckets_free(ca, bch2_dev_usage_read(ca));
 }
 
 /* Filesystem usage: */
@@ -249,33 +253,21 @@ void bch2_mark_metadata_bucket(struct bch_fs *, struct bch_dev *,
                               size_t, enum bch_data_type, unsigned,
                               struct gc_pos, unsigned);
 
-#define BCH_BUCKET_MARK_INSERT                 (1 << 0)
-#define BCH_BUCKET_MARK_OVERWRITE              (1 << 1)
-#define BCH_BUCKET_MARK_BUCKET_INVALIDATE      (1 << 2)
-#define BCH_BUCKET_MARK_GC                     (1 << 3)
-#define BCH_BUCKET_MARK_ALLOC_READ             (1 << 4)
-#define BCH_BUCKET_MARK_NOATOMIC               (1 << 5)
-
-int bch2_mark_key_locked(struct bch_fs *, struct bkey_s_c, s64,
-                        struct bch_fs_usage *, u64, unsigned);
-int bch2_mark_key(struct bch_fs *, struct bkey_s_c, s64,
-                 struct bch_fs_usage *, u64, unsigned);
+int bch2_mark_key(struct bch_fs *, struct bkey_s_c, unsigned,
+                 s64, struct bch_fs_usage *, u64, unsigned);
 int bch2_fs_usage_apply(struct bch_fs *, struct bch_fs_usage *,
                        struct disk_reservation *, unsigned);
 
-int bch2_mark_overwrite(struct btree_trans *, struct btree_iter *,
-                       struct bkey_s_c, struct bkey_i *,
-                       struct bch_fs_usage *, unsigned);
-int bch2_mark_update(struct btree_trans *, struct btree_insert_entry *,
-                    struct bch_fs_usage *, unsigned);
-
-void bch2_replicas_delta_list_apply(struct bch_fs *,
-                                   struct bch_fs_usage *,
-                                   struct replicas_delta_list *);
-int bch2_trans_mark_key(struct btree_trans *, struct bkey_s_c, s64, unsigned);
-int bch2_trans_mark_update(struct btree_trans *,
-                          struct btree_iter *iter,
-                          struct bkey_i *insert);
+int bch2_mark_update(struct btree_trans *, struct btree_iter *,
+                    struct bkey_i *, struct bch_fs_usage *, unsigned);
+
+int bch2_replicas_delta_list_apply(struct bch_fs *,
+                                  struct bch_fs_usage *,
+                                  struct replicas_delta_list *);
+int bch2_trans_mark_key(struct btree_trans *, struct bkey_s_c,
+                       unsigned, s64, unsigned);
+int bch2_trans_mark_update(struct btree_trans *, struct btree_iter *iter,
+                          struct bkey_i *insert, unsigned);
 void bch2_trans_fs_usage_apply(struct btree_trans *, struct bch_fs_usage *);
 
 /* disk reservations: */