Commit ef5a05c5 authored by Chengming Zhou's avatar Chengming Zhou Committed by David Sterba

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
16a1d968 ("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: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarChengming Zhou <zhouchengming@bytedance.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent d139ded8
...@@ -198,10 +198,7 @@ static struct kmem_cache *btrfs_prelim_ref_cache; ...@@ -198,10 +198,7 @@ static struct kmem_cache *btrfs_prelim_ref_cache;
int __init btrfs_prelim_ref_init(void) int __init btrfs_prelim_ref_init(void)
{ {
btrfs_prelim_ref_cache = kmem_cache_create("btrfs_prelim_ref", btrfs_prelim_ref_cache = kmem_cache_create("btrfs_prelim_ref",
sizeof(struct prelim_ref), sizeof(struct prelim_ref), 0, 0, NULL);
0,
SLAB_MEM_SPREAD,
NULL);
if (!btrfs_prelim_ref_cache) if (!btrfs_prelim_ref_cache)
return -ENOMEM; return -ENOMEM;
return 0; return 0;
......
...@@ -5086,7 +5086,7 @@ int btrfs_previous_extent_item(struct btrfs_root *root, ...@@ -5086,7 +5086,7 @@ int btrfs_previous_extent_item(struct btrfs_root *root,
int __init btrfs_ctree_init(void) 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) if (!btrfs_path_cachep)
return -ENOMEM; return -ENOMEM;
return 0; return 0;
......
...@@ -1510,9 +1510,7 @@ void __cold btrfs_auto_defrag_exit(void) ...@@ -1510,9 +1510,7 @@ void __cold btrfs_auto_defrag_exit(void)
int __init btrfs_auto_defrag_init(void) int __init btrfs_auto_defrag_init(void)
{ {
btrfs_inode_defrag_cachep = kmem_cache_create("btrfs_inode_defrag", btrfs_inode_defrag_cachep = kmem_cache_create("btrfs_inode_defrag",
sizeof(struct inode_defrag), 0, sizeof(struct inode_defrag), 0, 0, NULL);
SLAB_MEM_SPREAD,
NULL);
if (!btrfs_inode_defrag_cachep) if (!btrfs_inode_defrag_cachep)
return -ENOMEM; return -ENOMEM;
......
...@@ -28,7 +28,7 @@ static struct kmem_cache *delayed_node_cache; ...@@ -28,7 +28,7 @@ static struct kmem_cache *delayed_node_cache;
int __init btrfs_delayed_inode_init(void) 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) if (!delayed_node_cache)
return -ENOMEM; return -ENOMEM;
return 0; return 0;
......
...@@ -1307,23 +1307,19 @@ void __cold btrfs_delayed_ref_exit(void) ...@@ -1307,23 +1307,19 @@ void __cold btrfs_delayed_ref_exit(void)
int __init btrfs_delayed_ref_init(void) int __init btrfs_delayed_ref_init(void)
{ {
btrfs_delayed_ref_head_cachep = KMEM_CACHE(btrfs_delayed_ref_head, btrfs_delayed_ref_head_cachep = KMEM_CACHE(btrfs_delayed_ref_head, 0);
SLAB_MEM_SPREAD);
if (!btrfs_delayed_ref_head_cachep) if (!btrfs_delayed_ref_head_cachep)
goto fail; goto fail;
btrfs_delayed_tree_ref_cachep = KMEM_CACHE(btrfs_delayed_tree_ref, btrfs_delayed_tree_ref_cachep = KMEM_CACHE(btrfs_delayed_tree_ref, 0);
SLAB_MEM_SPREAD);
if (!btrfs_delayed_tree_ref_cachep) if (!btrfs_delayed_tree_ref_cachep)
goto fail; goto fail;
btrfs_delayed_data_ref_cachep = KMEM_CACHE(btrfs_delayed_data_ref, btrfs_delayed_data_ref_cachep = KMEM_CACHE(btrfs_delayed_data_ref, 0);
SLAB_MEM_SPREAD);
if (!btrfs_delayed_data_ref_cachep) if (!btrfs_delayed_data_ref_cachep)
goto fail; goto fail;
btrfs_delayed_extent_op_cachep = KMEM_CACHE(btrfs_delayed_extent_op, btrfs_delayed_extent_op_cachep = KMEM_CACHE(btrfs_delayed_extent_op, 0);
SLAB_MEM_SPREAD);
if (!btrfs_delayed_extent_op_cachep) if (!btrfs_delayed_extent_op_cachep)
goto fail; goto fail;
......
...@@ -1883,8 +1883,8 @@ void __cold extent_state_free_cachep(void) ...@@ -1883,8 +1883,8 @@ void __cold extent_state_free_cachep(void)
int __init extent_state_init_cachep(void) int __init extent_state_init_cachep(void)
{ {
extent_state_cache = kmem_cache_create("btrfs_extent_state", extent_state_cache = kmem_cache_create("btrfs_extent_state",
sizeof(struct extent_state), 0, sizeof(struct extent_state), 0, 0,
SLAB_MEM_SPREAD, NULL); NULL);
if (!extent_state_cache) if (!extent_state_cache)
return -ENOMEM; return -ENOMEM;
......
...@@ -146,8 +146,8 @@ static void submit_write_bio(struct btrfs_bio_ctrl *bio_ctrl, int ret) ...@@ -146,8 +146,8 @@ static void submit_write_bio(struct btrfs_bio_ctrl *bio_ctrl, int ret)
int __init extent_buffer_init_cachep(void) int __init extent_buffer_init_cachep(void)
{ {
extent_buffer_cache = kmem_cache_create("btrfs_extent_buffer", extent_buffer_cache = kmem_cache_create("btrfs_extent_buffer",
sizeof(struct extent_buffer), 0, sizeof(struct extent_buffer), 0, 0,
SLAB_MEM_SPREAD, NULL); NULL);
if (!extent_buffer_cache) if (!extent_buffer_cache)
return -ENOMEM; return -ENOMEM;
......
...@@ -15,8 +15,7 @@ static struct kmem_cache *extent_map_cache; ...@@ -15,8 +15,7 @@ static struct kmem_cache *extent_map_cache;
int __init extent_map_init(void) int __init extent_map_init(void)
{ {
extent_map_cache = kmem_cache_create("btrfs_extent_map", extent_map_cache = kmem_cache_create("btrfs_extent_map",
sizeof(struct extent_map), 0, sizeof(struct extent_map), 0, 0, NULL);
SLAB_MEM_SPREAD, NULL);
if (!extent_map_cache) if (!extent_map_cache)
return -ENOMEM; return -ENOMEM;
return 0; return 0;
......
...@@ -4154,13 +4154,13 @@ int btrfs_set_free_space_cache_v1_active(struct btrfs_fs_info *fs_info, bool act ...@@ -4154,13 +4154,13 @@ int btrfs_set_free_space_cache_v1_active(struct btrfs_fs_info *fs_info, bool act
int __init btrfs_free_space_init(void) 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) if (!btrfs_free_space_cachep)
return -ENOMEM; return -ENOMEM;
btrfs_free_space_bitmap_cachep = kmem_cache_create("btrfs_free_space_bitmap", btrfs_free_space_bitmap_cachep = kmem_cache_create("btrfs_free_space_bitmap",
PAGE_SIZE, PAGE_SIZE, PAGE_SIZE, PAGE_SIZE,
SLAB_MEM_SPREAD, NULL); 0, NULL);
if (!btrfs_free_space_bitmap_cachep) { if (!btrfs_free_space_bitmap_cachep) {
kmem_cache_destroy(btrfs_free_space_cachep); kmem_cache_destroy(btrfs_free_space_cachep);
return -ENOMEM; return -ENOMEM;
......
...@@ -8730,7 +8730,7 @@ int __init btrfs_init_cachep(void) ...@@ -8730,7 +8730,7 @@ int __init btrfs_init_cachep(void)
{ {
btrfs_inode_cachep = kmem_cache_create("btrfs_inode", btrfs_inode_cachep = kmem_cache_create("btrfs_inode",
sizeof(struct btrfs_inode), 0, sizeof(struct btrfs_inode), 0,
SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD | SLAB_ACCOUNT, SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,
init_once); init_once);
if (!btrfs_inode_cachep) if (!btrfs_inode_cachep)
goto fail; goto fail;
......
...@@ -1235,7 +1235,7 @@ struct btrfs_ordered_extent *btrfs_split_ordered_extent( ...@@ -1235,7 +1235,7 @@ struct btrfs_ordered_extent *btrfs_split_ordered_extent(
int __init ordered_data_init(void) 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) if (!btrfs_ordered_extent_cache)
return -ENOMEM; return -ENOMEM;
......
...@@ -2671,8 +2671,7 @@ void __cold __btrfs_abort_transaction(struct btrfs_trans_handle *trans, ...@@ -2671,8 +2671,7 @@ void __cold __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
int __init btrfs_transaction_init(void) int __init btrfs_transaction_init(void)
{ {
btrfs_trans_handle_cachep = KMEM_CACHE(btrfs_trans_handle, btrfs_trans_handle_cachep = KMEM_CACHE(btrfs_trans_handle, SLAB_TEMPORARY);
SLAB_TEMPORARY | SLAB_MEM_SPREAD);
if (!btrfs_trans_handle_cachep) if (!btrfs_trans_handle_cachep)
return -ENOMEM; return -ENOMEM;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment