Update bcachefs sources to 31c09369cd six locks: Fix an unitialized var

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

diff --git a/libbcachefs/lru.h b/libbcachefs/lru.h
index e8f508174b0a81671041bf489c7ae169e8c0f3aa..adb98429248ef3ceee4b34f34d05417fbe3a1ce8 100644 (file)
--- a/libbcachefs/lru.h
+++ b/libbcachefs/lru.h
@@ -2,16 +2,62 @@
 #ifndef _BCACHEFS_LRU_H
 #define _BCACHEFS_LRU_H
 
-int bch2_lru_invalid(const struct bch_fs *, struct bkey_s_c, int, struct printbuf *);
+#define LRU_TIME_BITS  48
+#define LRU_TIME_MAX   ((1ULL << LRU_TIME_BITS) - 1)
+
+static inline struct bpos lru_pos(u16 lru_id, u64 dev_bucket, u64 time)
+{
+       EBUG_ON(time > LRU_TIME_MAX);
+
+       return POS(((u64) lru_id << LRU_TIME_BITS)|time, dev_bucket);
+}
+
+static inline u64 lru_pos_id(struct bpos pos)
+{
+       return pos.inode >> LRU_TIME_BITS;
+}
+
+static inline u64 lru_pos_time(struct bpos pos)
+{
+       return pos.inode & ~(~0ULL << LRU_TIME_BITS);
+}
+
+#define BCH_LRU_TYPES()                \
+       x(read)                 \
+       x(fragmentation)
+
+enum bch_lru_type {
+#define x(n) BCH_LRU_##n,
+       BCH_LRU_TYPES()
+#undef x
+};
+
+#define BCH_LRU_FRAGMENTATION_START    ((1U << 16) - 1)
+
+static inline enum bch_lru_type lru_type(struct bkey_s_c l)
+{
+       u16 lru_id = l.k->p.inode >> 48;
+
+       if (lru_id == BCH_LRU_FRAGMENTATION_START)
+               return BCH_LRU_fragmentation;
+       return BCH_LRU_read;
+}
+
+int bch2_lru_invalid(const struct bch_fs *, struct bkey_s_c, unsigned, struct printbuf *);
 void bch2_lru_to_text(struct printbuf *, struct bch_fs *, struct bkey_s_c);
 
-#define bch2_bkey_ops_lru (struct bkey_ops) {  \
+void bch2_lru_pos_to_text(struct printbuf *, struct bpos);
+
+#define bch2_bkey_ops_lru ((struct bkey_ops) { \
        .key_invalid    = bch2_lru_invalid,     \
        .val_to_text    = bch2_lru_to_text,     \
-}
+       .min_val_size   = 8,                    \
+})
 
-int bch2_lru_change(struct btree_trans *, u64, u64, u64, u64 *);
+int bch2_lru_del(struct btree_trans *, u16, u64, u64);
+int bch2_lru_set(struct btree_trans *, u16, u64, u64);
+int bch2_lru_change(struct btree_trans *, u16, u64, u64, u64);
 
-int bch2_check_lrus(struct bch_fs *, bool);
+int bch2_check_lrus(struct bch_fs *);
 
 #endif /* _BCACHEFS_LRU_H */