bcachefs: split out lru_format.h

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/bcachefs_format.h b/fs/bcachefs/bcachefs_format.h
index 8d8444fa0ec2b676a8f2b53d0435cc48cbe9efa4..74a60b1a4ddfa70f7353b7c99584b0a216d4b7c3 100644 (file)
--- a/fs/bcachefs/bcachefs_format.h
+++ b/fs/bcachefs/bcachefs_format.h
@@ -468,18 +468,6 @@ struct bch_backpointer {
        struct bpos             pos;
 } __packed __aligned(8);
 
-/* LRU btree: */
-
-struct bch_lru {
-       struct bch_val          v;
-       __le64                  idx;
-} __packed __aligned(8);
-
-#define LRU_ID_STRIPES         (1U << 16)
-
-#define LRU_TIME_BITS  48
-#define LRU_TIME_MAX   ((1ULL << LRU_TIME_BITS) - 1)
-
 /* Optional/variable size superblock sections: */
 
 struct bch_sb_field {
@@ -516,6 +504,7 @@ struct bch_sb_field {
 #include "inode_format.h"
 #include "journal_seq_blacklist_format.h"
 #include "logged_ops_format.h"
+#include "lru_format.h"
 #include "quota_format.h"
 #include "reflink_format.h"
 #include "replicas_format.h"

diff --git a/fs/bcachefs/lru.h b/fs/bcachefs/lru.h
index ed75bcf59d4786d7dd34a92fd2f1345fdec8a016..5bd8974a7f11e52fb70362cf60745ffcc7e342b7 100644 (file)
--- a/fs/bcachefs/lru.h
+++ b/fs/bcachefs/lru.h
@@ -24,18 +24,6 @@ static inline struct bpos lru_pos(u16 lru_id, u64 dev_bucket, u64 time)
        return pos;
 }
 
-#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;

diff --git a/fs/bcachefs/lru_format.h b/fs/bcachefs/lru_format.h
new file mode 100644 (file)
index 0000000..f372cb3
--- /dev/null
+++ b/fs/bcachefs/lru_format.h
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _BCACHEFS_LRU_FORMAT_H
+#define _BCACHEFS_LRU_FORMAT_H
+
+struct bch_lru {
+       struct bch_val          v;
+       __le64                  idx;
+} __packed __aligned(8);
+
+#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)
+
+#define LRU_TIME_BITS                  48
+#define LRU_TIME_MAX                   ((1ULL << LRU_TIME_BITS) - 1)
+
+#endif /* _BCACHEFS_LRU_FORMAT_H */