bcachefs: s/BCH_LRU_FRAGMENTATION_START/BCH_LRU_BUCKET_FRAGMENTATION/

FRAGMENTATION_START was incorrect, there's currently only one
fragmentation LRU (at the end of the reserved bits for LRU type), and
we're getting ready to add a stripe fragmentation lru - so give it a
better name.

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

diff --git a/fs/bcachefs/alloc_background.c b/fs/bcachefs/alloc_background.c
index e1061524bdf5d1b17843e1e1ad039323b3897283..87ff50a3cd8174aa847fe8f9821d9329afa4633c 100644 (file)
--- a/fs/bcachefs/alloc_background.c
+++ b/fs/bcachefs/alloc_background.c
@@ -897,7 +897,7 @@ int bch2_trigger_alloc(struct btree_trans *trans,
                        goto err;
 
                ret = bch2_lru_change(trans,
-                                     BCH_LRU_FRAGMENTATION_START,
+                                     BCH_LRU_BUCKET_FRAGMENTATION,
                                      bucket_to_u64(new.k->p),
                                      alloc_lru_idx_fragmentation(*old_a, ca),
                                      alloc_lru_idx_fragmentation(*new_a, ca));
@@ -1699,7 +1699,7 @@ static int bch2_check_alloc_to_lru_ref(struct btree_trans *trans,
 
        u64 lru_idx = alloc_lru_idx_fragmentation(*a, ca);
        if (lru_idx) {
-               ret = bch2_lru_check_set(trans, BCH_LRU_FRAGMENTATION_START,
+               ret = bch2_lru_check_set(trans, BCH_LRU_BUCKET_FRAGMENTATION,
                                         lru_idx, alloc_k, last_flushed);
                if (ret)
                        goto err;

diff --git a/fs/bcachefs/lru.h b/fs/bcachefs/lru.h
index 2facc0758cb3f6fa6f1e030ff38013b2a92c27b7..398cc25db459344e84bddc87a74b8a3b7d6abcc7 100644 (file)
--- a/fs/bcachefs/lru.h
+++ b/fs/bcachefs/lru.h
@@ -28,7 +28,7 @@ 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)
+       if (lru_id == BCH_LRU_BUCKET_FRAGMENTATION)
                return BCH_LRU_fragmentation;
        return BCH_LRU_read;
 }

diff --git a/fs/bcachefs/lru_format.h b/fs/bcachefs/lru_format.h
index f372cb3b8cda06dc221fcf9cbcfff347a56eb6b1..353a352d3fb97155c4941cea8da6aaac5e72f3c7 100644 (file)
--- a/fs/bcachefs/lru_format.h
+++ b/fs/bcachefs/lru_format.h
@@ -17,7 +17,7 @@ enum bch_lru_type {
 #undef x
 };
 
-#define BCH_LRU_FRAGMENTATION_START    ((1U << 16) - 1)
+#define BCH_LRU_BUCKET_FRAGMENTATION   ((1U << 16) - 1)
 
 #define LRU_TIME_BITS                  48
 #define LRU_TIME_MAX                   ((1ULL << LRU_TIME_BITS) - 1)

diff --git a/fs/bcachefs/movinggc.c b/fs/bcachefs/movinggc.c
index 6718dc37c5a35bb92d24cdc291c4fcfb2f3585d0..fa19fc44622c9627a0adbc98d9f3a35f79f0f472 100644 (file)
--- a/fs/bcachefs/movinggc.c
+++ b/fs/bcachefs/movinggc.c
@@ -167,8 +167,8 @@ static int bch2_copygc_get_buckets(struct moving_context *ctxt,
        bch2_trans_begin(trans);
 
        ret = for_each_btree_key_max(trans, iter, BTREE_ID_lru,
-                                 lru_pos(BCH_LRU_FRAGMENTATION_START, 0, 0),
-                                 lru_pos(BCH_LRU_FRAGMENTATION_START, U64_MAX, LRU_TIME_MAX),
+                                 lru_pos(BCH_LRU_BUCKET_FRAGMENTATION, 0, 0),
+                                 lru_pos(BCH_LRU_BUCKET_FRAGMENTATION, U64_MAX, LRU_TIME_MAX),
                                  0, k, ({
                struct move_bucket b = { .k.bucket = u64_to_bucket(k.k->p.offset) };
                int ret2 = 0;