btrfs: remove SLAB_MEM_SPREAD flag use

The SLAB_MEM_SPREAD flag used to be implemented in SLAB, which was
removed as of v6.8-rc1, so it became a dead flag since the commit
16a1d968358a ("mm/slab: remove mm/slab.c and slab_def.h"). And the
series[1] went on to mark it obsolete to avoid confusion for users.
Here we can just remove all its users, which has no functional change.

[1] https://lore.kernel.org/all/20240223-slab-cleanup-flags-v2-1-02f1753e8303@suse.cz/

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
index 6514cb1d404a78d23f623aaa86d4052a9f862643..c1e6a5bbeeaffe16b93846d5c8c0e90d4cc37659 100644 (file)
--- a/fs/btrfs/backref.c
+++ b/fs/btrfs/backref.c
@@ -198,10 +198,7 @@ static struct kmem_cache *btrfs_prelim_ref_cache;
 int __init btrfs_prelim_ref_init(void)
 {
        btrfs_prelim_ref_cache = kmem_cache_create("btrfs_prelim_ref",
-                                       sizeof(struct prelim_ref),
-                                       0,
-                                       SLAB_MEM_SPREAD,
-                                       NULL);
+                                       sizeof(struct prelim_ref), 0, 0, NULL);
        if (!btrfs_prelim_ref_cache)
                return -ENOMEM;
        return 0;

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index bae17dbe71d692abbfb2a5afe06d11cf187f26dd..aaf53fd84358eae56a976c19f7aa4ee49bcd67f7 100644 (file)
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -5086,7 +5086,7 @@ int btrfs_previous_extent_item(struct btrfs_root *root,
 
 int __init btrfs_ctree_init(void)
 {
-       btrfs_path_cachep = KMEM_CACHE(btrfs_path, SLAB_MEM_SPREAD);
+       btrfs_path_cachep = KMEM_CACHE(btrfs_path, 0);
        if (!btrfs_path_cachep)
                return -ENOMEM;
        return 0;

diff --git a/fs/btrfs/defrag.c b/fs/btrfs/defrag.c
index f17833a67af8ee91317a1aaadf7b72ab6566c4ee..f015fa1b63013e77d63bb334db860d79eda76a49 100644 (file)
--- a/fs/btrfs/defrag.c
+++ b/fs/btrfs/defrag.c
@@ -1510,9 +1510,7 @@ void __cold btrfs_auto_defrag_exit(void)
 int __init btrfs_auto_defrag_init(void)
 {
        btrfs_inode_defrag_cachep = kmem_cache_create("btrfs_inode_defrag",
-                                       sizeof(struct inode_defrag), 0,
-                                       SLAB_MEM_SPREAD,
-                                       NULL);
+                                       sizeof(struct inode_defrag), 0, 0, NULL);
        if (!btrfs_inode_defrag_cachep)
                return -ENOMEM;
 

diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 0a7a40d97e9140ee9a164fa65c04f39129d91394..dd6f566a383f00e83c9f36125ee4ecd3fc0e3541 100644 (file)
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -28,7 +28,7 @@ static struct kmem_cache *delayed_node_cache;
 
 int __init btrfs_delayed_inode_init(void)
 {
-       delayed_node_cache = KMEM_CACHE(btrfs_delayed_node, SLAB_MEM_SPREAD);
+       delayed_node_cache = KMEM_CACHE(btrfs_delayed_node, 0);
        if (!delayed_node_cache)
                return -ENOMEM;
        return 0;

diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index c90efc20b8b211cbdf9968a7797d6826bdcccc1c..e44e62cf76bc9d18b3fdd63077eb5397a8cb4679 100644 (file)
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -1307,23 +1307,19 @@ void __cold btrfs_delayed_ref_exit(void)
 
 int __init btrfs_delayed_ref_init(void)
 {
-       btrfs_delayed_ref_head_cachep = KMEM_CACHE(btrfs_delayed_ref_head,
-                                                  SLAB_MEM_SPREAD);
+       btrfs_delayed_ref_head_cachep = KMEM_CACHE(btrfs_delayed_ref_head, 0);
        if (!btrfs_delayed_ref_head_cachep)
                goto fail;
 
-       btrfs_delayed_tree_ref_cachep = KMEM_CACHE(btrfs_delayed_tree_ref,
-                                                  SLAB_MEM_SPREAD);
+       btrfs_delayed_tree_ref_cachep = KMEM_CACHE(btrfs_delayed_tree_ref, 0);
        if (!btrfs_delayed_tree_ref_cachep)
                goto fail;
 
-       btrfs_delayed_data_ref_cachep = KMEM_CACHE(btrfs_delayed_data_ref,
-                                                  SLAB_MEM_SPREAD);
+       btrfs_delayed_data_ref_cachep = KMEM_CACHE(btrfs_delayed_data_ref, 0);
        if (!btrfs_delayed_data_ref_cachep)
                goto fail;
 
-       btrfs_delayed_extent_op_cachep = KMEM_CACHE(btrfs_delayed_extent_op,
-                                                   SLAB_MEM_SPREAD);
+       btrfs_delayed_extent_op_cachep = KMEM_CACHE(btrfs_delayed_extent_op, 0);
        if (!btrfs_delayed_extent_op_cachep)
                goto fail;
 

diff --git a/fs/btrfs/extent-io-tree.c b/fs/btrfs/extent-io-tree.c
index 6b923c0ef4ea579800904af3dd32dcf10efff1af..c09b428823d76d89dbea579649ffcac296b9a84d 100644 (file)
--- a/fs/btrfs/extent-io-tree.c
+++ b/fs/btrfs/extent-io-tree.c
@@ -1883,8 +1883,8 @@ void __cold extent_state_free_cachep(void)
 int __init extent_state_init_cachep(void)
 {
        extent_state_cache = kmem_cache_create("btrfs_extent_state",
-                       sizeof(struct extent_state), 0,
-                       SLAB_MEM_SPREAD, NULL);
+                                              sizeof(struct extent_state), 0, 0,
+                                              NULL);
        if (!extent_state_cache)
                return -ENOMEM;
 

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index e73bffcaf763ba2c44f6641dd5d58f87f46c0608..e6a2b6eb89e19b9259f17f154e6ed9604202114d 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -146,8 +146,8 @@ static void submit_write_bio(struct btrfs_bio_ctrl *bio_ctrl, int ret)
 int __init extent_buffer_init_cachep(void)
 {
        extent_buffer_cache = kmem_cache_create("btrfs_extent_buffer",
-                       sizeof(struct extent_buffer), 0,
-                       SLAB_MEM_SPREAD, NULL);
+                                               sizeof(struct extent_buffer), 0, 0,
+                                               NULL);
        if (!extent_buffer_cache)
                return -ENOMEM;
 

diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c
index ea08601988debbdc9ce104775652a0cd42c5171c..347ca13d15a97586b36669e823e2ed3bec86449f 100644 (file)
--- a/fs/btrfs/extent_map.c
+++ b/fs/btrfs/extent_map.c
@@ -15,8 +15,7 @@ static struct kmem_cache *extent_map_cache;
 int __init extent_map_init(void)
 {
        extent_map_cache = kmem_cache_create("btrfs_extent_map",
-                       sizeof(struct extent_map), 0,
-                       SLAB_MEM_SPREAD, NULL);
+                                            sizeof(struct extent_map), 0, 0, NULL);
        if (!extent_map_cache)
                return -ENOMEM;
        return 0;

diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index d984912dae06d4b6390ca5ed1247a57660f30eb5..c8a05d5eb9cbc5262edac4151c977999934ef621 100644 (file)
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -4154,13 +4154,13 @@ out:
 
 int __init btrfs_free_space_init(void)
 {
-       btrfs_free_space_cachep = KMEM_CACHE(btrfs_free_space, SLAB_MEM_SPREAD);
+       btrfs_free_space_cachep = KMEM_CACHE(btrfs_free_space, 0);
        if (!btrfs_free_space_cachep)
                return -ENOMEM;
 
        btrfs_free_space_bitmap_cachep = kmem_cache_create("btrfs_free_space_bitmap",
                                                        PAGE_SIZE, PAGE_SIZE,
-                                                       SLAB_MEM_SPREAD, NULL);
+                                                       0, NULL);
        if (!btrfs_free_space_bitmap_cachep) {
                kmem_cache_destroy(btrfs_free_space_cachep);
                return -ENOMEM;

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 904fff3d72f54b98f1248615523008cc1b4a3f83..37701531eeb1ba486cd8117f104794083dff8816 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -8730,7 +8730,7 @@ int __init btrfs_init_cachep(void)
 {
        btrfs_inode_cachep = kmem_cache_create("btrfs_inode",
                        sizeof(struct btrfs_inode), 0,
-                       SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD | SLAB_ACCOUNT,
+                       SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,
                        init_once);
        if (!btrfs_inode_cachep)
                goto fail;

diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index 1ee2fb8dcd6a3adb526ffe20c430ab71f59a691f..b749ba45da2ba2b13d75695e882ab343dda9439c 100644 (file)
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -1235,7 +1235,7 @@ struct btrfs_ordered_extent *btrfs_split_ordered_extent(
 
 int __init ordered_data_init(void)
 {
-       btrfs_ordered_extent_cache = KMEM_CACHE(btrfs_ordered_extent, SLAB_MEM_SPREAD);
+       btrfs_ordered_extent_cache = KMEM_CACHE(btrfs_ordered_extent, 0);
        if (!btrfs_ordered_extent_cache)
                return -ENOMEM;
 

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 31ac5a04cc029689d25c8f612af5eb57293505a3..46e8426adf4f15768507303430b38c9e6be56c7d 100644 (file)
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -2671,8 +2671,7 @@ void __cold __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
 
 int __init btrfs_transaction_init(void)
 {
-       btrfs_trans_handle_cachep = KMEM_CACHE(btrfs_trans_handle,
-                                              SLAB_TEMPORARY | SLAB_MEM_SPREAD);
+       btrfs_trans_handle_cachep = KMEM_CACHE(btrfs_trans_handle, SLAB_TEMPORARY);
        if (!btrfs_trans_handle_cachep)
                return -ENOMEM;
        return 0;