btrfs: remove SLAB_MEM_SPREAD flag usage
Subsystems (2)
PATCH 1/1 btrfs: remove SLAB_MEM_SPREAD flag usage
From: Chengming Zhou <[email protected]>
The SLAB_MEM_SPREAD flag is already a no-op as of 6.8-rc1, remove its usage so we can delete it from slab. No functional change.
--- fs/btrfs/backref.c | 2 +- fs/btrfs/ctree.c | 2 +- fs/btrfs/defrag.c | 2 +- fs/btrfs/delayed-inode.c | 2 +- fs/btrfs/delayed-ref.c | 8 ++++---- fs/btrfs/extent-io-tree.c | 2 +- fs/btrfs/extent_io.c | 2 +- fs/btrfs/extent_map.c | 2 +- fs/btrfs/free-space-cache.c | 4 ++-- fs/btrfs/inode.c | 2 +- fs/btrfs/ordered-data.c | 2 +- fs/btrfs/transaction.c | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-)
fs/btrfs/backref.c +1 -1
@@ -200,7 +200,7 @@ 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 , +0 ,NULL );if (!btrfs_prelim_ref_cache)return -ENOMEM ;
fs/btrfs/ctree.c +1 -1
@@ -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 ;
fs/btrfs/defrag.c +1 -1
@@ -1516,7 +1516,7 @@ 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 , +0 ,NULL );if (!btrfs_inode_defrag_cachep)return -ENOMEM ;
fs/btrfs/delayed-inode.c +1 -1
@@ -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 ;
fs/btrfs/delayed-ref.c +4 -4
@@ -1308,22 +1308,22 @@ 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 ); +0 );if (!btrfs_delayed_ref_head_cachep) goto fail; btrfs_delayed_tree_ref_cachep =KMEM_CACHE (btrfs_delayed_tree_ref, -SLAB_MEM_SPREAD ); +0 );if (!btrfs_delayed_tree_ref_cachep) goto fail; btrfs_delayed_data_ref_cachep =KMEM_CACHE (btrfs_delayed_data_ref, -SLAB_MEM_SPREAD ); +0 );if (!btrfs_delayed_data_ref_cachep) goto fail; btrfs_delayed_extent_op_cachep =KMEM_CACHE (btrfs_delayed_extent_op, -SLAB_MEM_SPREAD ); +0 );if (!btrfs_delayed_extent_op_cachep) goto fail;
fs/btrfs/extent-io-tree.c +1 -1
@@ -1884,7 +1884,7 @@ 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 ); +0 ,NULL );if (!extent_state_cache)return -ENOMEM ;
fs/btrfs/extent_io.c +1 -1
@@ -147,7 +147,7 @@ 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 ); +0 ,NULL );if (!extent_buffer_cache)return -ENOMEM ;
fs/btrfs/extent_map.c +1 -1
@@ -16,7 +16,7 @@ int __init extent_map_init(void) { extent_map_cache =kmem_cache_create ("btrfs_extent_map" ,sizeof (struct extent_map ),0 , -SLAB_MEM_SPREAD ,NULL ); +0 ,NULL );if (!extent_map_cache)return -ENOMEM ;return 0 ;
fs/btrfs/free-space-cache.c +2 -2
@@ -4154,13 +4154,13 @@ int btrfs_set_free_space_cache_v1_active(struct btrfs_fs_info *fs_info, bool actint __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 ;
fs/btrfs/inode.c +1 -1
@@ -8717,7 +8717,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;
fs/btrfs/ordered-data.c +1 -1
@@ -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 ;
fs/btrfs/transaction.c +1 -1
@@ -2672,7 +2672,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 ); +SLAB_TEMPORARY );if (!btrfs_trans_handle_cachep)return -ENOMEM ;return 0 ;
Signature · 1 line
2.40.1
Quoted 4 lines · On 2024/2/24 21:47, [email protected] wrote:
From: Chengming Zhou <[email protected]>
The
SLAB_MEM_SPREADflag is already a no-op as of 6.8-rc1, remove its usage so we can delete it from slab. No functional change.
Update changelog to make it clearer:
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/[email protected]/
Thanks!
Quoted 198 lines
Signed-off-by Chengming Zhou <[email protected]>--- fs/btrfs/backref.c | 2 +- fs/btrfs/ctree.c | 2 +- fs/btrfs/defrag.c | 2 +- fs/btrfs/delayed-inode.c | 2 +- fs/btrfs/delayed-ref.c | 8 ++++---- fs/btrfs/extent-io-tree.c | 2 +- fs/btrfs/extent_io.c | 2 +- fs/btrfs/extent_map.c | 2 +- fs/btrfs/free-space-cache.c | 4 ++-- fs/btrfs/inode.c | 2 +- fs/btrfs/ordered-data.c | 2 +- fs/btrfs/transaction.c | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-)fs/btrfs/backref.c +1
-1@@ -200,7 +200,7 @@ 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 , +0 ,NULL );if (!btrfs_prelim_ref_cache)return -ENOMEM ;fs/btrfs/ctree.c +1
-1@@ -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 ;fs/btrfs/defrag.c +1
-1@@ -1516,7 +1516,7 @@ 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 , +0 ,NULL );if (!btrfs_inode_defrag_cachep)return -ENOMEM ;fs/btrfs/delayed-inode.c +1
-1@@ -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 ;fs/btrfs/delayed-ref.c +4
-4@@ -1308,22 +1308,22 @@ 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 ); +0 );if (!btrfs_delayed_ref_head_cachep) goto fail; btrfs_delayed_tree_ref_cachep =KMEM_CACHE (btrfs_delayed_tree_ref, -SLAB_MEM_SPREAD ); +0 );if (!btrfs_delayed_tree_ref_cachep) goto fail; btrfs_delayed_data_ref_cachep =KMEM_CACHE (btrfs_delayed_data_ref, -SLAB_MEM_SPREAD ); +0 );if (!btrfs_delayed_data_ref_cachep) goto fail; btrfs_delayed_extent_op_cachep =KMEM_CACHE (btrfs_delayed_extent_op, -SLAB_MEM_SPREAD ); +0 );if (!btrfs_delayed_extent_op_cachep) goto fail;fs/btrfs/extent-io-tree.c +1
-1@@ -1884,7 +1884,7 @@ 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 ); +0 ,NULL );if (!extent_state_cache)return -ENOMEM ;fs/btrfs/extent_io.c +1
-1@@ -147,7 +147,7 @@ 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 ); +0 ,NULL );if (!extent_buffer_cache)return -ENOMEM ;fs/btrfs/extent_map.c +1
-1@@ -16,7 +16,7 @@ int __init extent_map_init(void) { extent_map_cache =kmem_cache_create ("btrfs_extent_map" ,sizeof (struct extent_map ),0 , -SLAB_MEM_SPREAD ,NULL ); +0 ,NULL );if (!extent_map_cache)return -ENOMEM ;return 0 ;fs/btrfs/free-space-cache.c +2
-2@@ -4154,13 +4154,13 @@ int btrfs_set_free_space_cache_v1_active(struct btrfs_fs_info *fs_info, bool actint __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 ;fs/btrfs/inode.c +1
-1@@ -8717,7 +8717,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;fs/btrfs/ordered-data.c +1
-1@@ -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 ;fs/btrfs/transaction.c +1
-1@@ -2672,7 +2672,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 ); +SLAB_TEMPORARY );if (!btrfs_trans_handle_cachep)return -ENOMEM ;return 0 ;
Johannes Thumshirn
Reviewed-byWith the updated changelog,
Quoted 6 lines · On Sat, Feb 24, 2024 at 01:47:09PM +0000, [email protected] wrote:
From: Chengming Zhou <[email protected]>
The
SLAB_MEM_SPREADflag is already a no-op as of 6.8-rc1, remove its usage so we can delete it from slab. No functional change.Signed-off-by Chengming Zhou <[email protected]>
With updated changelog and some formatting adjustments added to for-next, thanks.