Skip to content

Commit 2d4aefb

Browse files
Chengming Zhoukdave
Chengming Zhou
authored andcommitted
btrfs: remove SLAB_MEM_SPREAD flag usage
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 16a1d96 ("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/[email protected]/ Reviewed-by: Johannes Thumshirn <[email protected]> Signed-off-by: Chengming Zhou <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent caa20d2 commit 2d4aefb

12 files changed

+18
-29
lines changed

Diff for: fs/btrfs/backref.c

+1-4
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,7 @@ static struct kmem_cache *btrfs_prelim_ref_cache;
198198
int __init btrfs_prelim_ref_init(void)
199199
{
200200
btrfs_prelim_ref_cache = kmem_cache_create("btrfs_prelim_ref",
201-
sizeof(struct prelim_ref),
202-
0,
203-
SLAB_MEM_SPREAD,
204-
NULL);
201+
sizeof(struct prelim_ref), 0, 0, NULL);
205202
if (!btrfs_prelim_ref_cache)
206203
return -ENOMEM;
207204
return 0;

Diff for: fs/btrfs/ctree.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5086,7 +5086,7 @@ int btrfs_previous_extent_item(struct btrfs_root *root,
50865086

50875087
int __init btrfs_ctree_init(void)
50885088
{
5089-
btrfs_path_cachep = KMEM_CACHE(btrfs_path, SLAB_MEM_SPREAD);
5089+
btrfs_path_cachep = KMEM_CACHE(btrfs_path, 0);
50905090
if (!btrfs_path_cachep)
50915091
return -ENOMEM;
50925092
return 0;

Diff for: fs/btrfs/defrag.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -1510,9 +1510,7 @@ void __cold btrfs_auto_defrag_exit(void)
15101510
int __init btrfs_auto_defrag_init(void)
15111511
{
15121512
btrfs_inode_defrag_cachep = kmem_cache_create("btrfs_inode_defrag",
1513-
sizeof(struct inode_defrag), 0,
1514-
SLAB_MEM_SPREAD,
1515-
NULL);
1513+
sizeof(struct inode_defrag), 0, 0, NULL);
15161514
if (!btrfs_inode_defrag_cachep)
15171515
return -ENOMEM;
15181516

Diff for: fs/btrfs/delayed-inode.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static struct kmem_cache *delayed_node_cache;
2828

2929
int __init btrfs_delayed_inode_init(void)
3030
{
31-
delayed_node_cache = KMEM_CACHE(btrfs_delayed_node, SLAB_MEM_SPREAD);
31+
delayed_node_cache = KMEM_CACHE(btrfs_delayed_node, 0);
3232
if (!delayed_node_cache)
3333
return -ENOMEM;
3434
return 0;

Diff for: fs/btrfs/delayed-ref.c

+4-8
Original file line numberDiff line numberDiff line change
@@ -1307,23 +1307,19 @@ void __cold btrfs_delayed_ref_exit(void)
13071307

13081308
int __init btrfs_delayed_ref_init(void)
13091309
{
1310-
btrfs_delayed_ref_head_cachep = KMEM_CACHE(btrfs_delayed_ref_head,
1311-
SLAB_MEM_SPREAD);
1310+
btrfs_delayed_ref_head_cachep = KMEM_CACHE(btrfs_delayed_ref_head, 0);
13121311
if (!btrfs_delayed_ref_head_cachep)
13131312
goto fail;
13141313

1315-
btrfs_delayed_tree_ref_cachep = KMEM_CACHE(btrfs_delayed_tree_ref,
1316-
SLAB_MEM_SPREAD);
1314+
btrfs_delayed_tree_ref_cachep = KMEM_CACHE(btrfs_delayed_tree_ref, 0);
13171315
if (!btrfs_delayed_tree_ref_cachep)
13181316
goto fail;
13191317

1320-
btrfs_delayed_data_ref_cachep = KMEM_CACHE(btrfs_delayed_data_ref,
1321-
SLAB_MEM_SPREAD);
1318+
btrfs_delayed_data_ref_cachep = KMEM_CACHE(btrfs_delayed_data_ref, 0);
13221319
if (!btrfs_delayed_data_ref_cachep)
13231320
goto fail;
13241321

1325-
btrfs_delayed_extent_op_cachep = KMEM_CACHE(btrfs_delayed_extent_op,
1326-
SLAB_MEM_SPREAD);
1322+
btrfs_delayed_extent_op_cachep = KMEM_CACHE(btrfs_delayed_extent_op, 0);
13271323
if (!btrfs_delayed_extent_op_cachep)
13281324
goto fail;
13291325

Diff for: fs/btrfs/extent-io-tree.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1883,8 +1883,8 @@ void __cold extent_state_free_cachep(void)
18831883
int __init extent_state_init_cachep(void)
18841884
{
18851885
extent_state_cache = kmem_cache_create("btrfs_extent_state",
1886-
sizeof(struct extent_state), 0,
1887-
SLAB_MEM_SPREAD, NULL);
1886+
sizeof(struct extent_state), 0, 0,
1887+
NULL);
18881888
if (!extent_state_cache)
18891889
return -ENOMEM;
18901890

Diff for: fs/btrfs/extent_io.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ static void submit_write_bio(struct btrfs_bio_ctrl *bio_ctrl, int ret)
146146
int __init extent_buffer_init_cachep(void)
147147
{
148148
extent_buffer_cache = kmem_cache_create("btrfs_extent_buffer",
149-
sizeof(struct extent_buffer), 0,
150-
SLAB_MEM_SPREAD, NULL);
149+
sizeof(struct extent_buffer), 0, 0,
150+
NULL);
151151
if (!extent_buffer_cache)
152152
return -ENOMEM;
153153

Diff for: fs/btrfs/extent_map.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ static struct kmem_cache *extent_map_cache;
1515
int __init extent_map_init(void)
1616
{
1717
extent_map_cache = kmem_cache_create("btrfs_extent_map",
18-
sizeof(struct extent_map), 0,
19-
SLAB_MEM_SPREAD, NULL);
18+
sizeof(struct extent_map), 0, 0, NULL);
2019
if (!extent_map_cache)
2120
return -ENOMEM;
2221
return 0;

Diff for: fs/btrfs/free-space-cache.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -4154,13 +4154,13 @@ int btrfs_set_free_space_cache_v1_active(struct btrfs_fs_info *fs_info, bool act
41544154

41554155
int __init btrfs_free_space_init(void)
41564156
{
4157-
btrfs_free_space_cachep = KMEM_CACHE(btrfs_free_space, SLAB_MEM_SPREAD);
4157+
btrfs_free_space_cachep = KMEM_CACHE(btrfs_free_space, 0);
41584158
if (!btrfs_free_space_cachep)
41594159
return -ENOMEM;
41604160

41614161
btrfs_free_space_bitmap_cachep = kmem_cache_create("btrfs_free_space_bitmap",
41624162
PAGE_SIZE, PAGE_SIZE,
4163-
SLAB_MEM_SPREAD, NULL);
4163+
0, NULL);
41644164
if (!btrfs_free_space_bitmap_cachep) {
41654165
kmem_cache_destroy(btrfs_free_space_cachep);
41664166
return -ENOMEM;

Diff for: fs/btrfs/inode.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8730,7 +8730,7 @@ int __init btrfs_init_cachep(void)
87308730
{
87318731
btrfs_inode_cachep = kmem_cache_create("btrfs_inode",
87328732
sizeof(struct btrfs_inode), 0,
8733-
SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD | SLAB_ACCOUNT,
8733+
SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,
87348734
init_once);
87358735
if (!btrfs_inode_cachep)
87368736
goto fail;

Diff for: fs/btrfs/ordered-data.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1235,7 +1235,7 @@ struct btrfs_ordered_extent *btrfs_split_ordered_extent(
12351235

12361236
int __init ordered_data_init(void)
12371237
{
1238-
btrfs_ordered_extent_cache = KMEM_CACHE(btrfs_ordered_extent, SLAB_MEM_SPREAD);
1238+
btrfs_ordered_extent_cache = KMEM_CACHE(btrfs_ordered_extent, 0);
12391239
if (!btrfs_ordered_extent_cache)
12401240
return -ENOMEM;
12411241

Diff for: fs/btrfs/transaction.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -2671,8 +2671,7 @@ void __cold __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
26712671

26722672
int __init btrfs_transaction_init(void)
26732673
{
2674-
btrfs_trans_handle_cachep = KMEM_CACHE(btrfs_trans_handle,
2675-
SLAB_TEMPORARY | SLAB_MEM_SPREAD);
2674+
btrfs_trans_handle_cachep = KMEM_CACHE(btrfs_trans_handle, SLAB_TEMPORARY);
26762675
if (!btrfs_trans_handle_cachep)
26772676
return -ENOMEM;
26782677
return 0;

0 commit comments

Comments
 (0)