From patchwork Sat Feb 24 13:47:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 13570426 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D297BC48BF6 for ; Sat, 24 Feb 2024 13:47:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6A3FE6B0085; Sat, 24 Feb 2024 08:47:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 653736B0087; Sat, 24 Feb 2024 08:47:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 542956B0088; Sat, 24 Feb 2024 08:47:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 4349B6B0085 for ; Sat, 24 Feb 2024 08:47:21 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id ECEEFA0362 for ; Sat, 24 Feb 2024 13:47:20 +0000 (UTC) X-FDA: 81826824240.02.D779A91 Received: from out-176.mta1.migadu.com (out-176.mta1.migadu.com [95.215.58.176]) by imf07.hostedemail.com (Postfix) with ESMTP id 8C58B40007 for ; Sat, 24 Feb 2024 13:47:19 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=PRi3Bq1B; spf=pass (imf07.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.176 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1708782439; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=yKqN1sI8hqn9RRCulN4vsVyKZb8ToBpRi5CxTQ7ZeiE=; b=ae5kL3VRtMENdmrN7pHuJkPgj8LZ0qqENpemX5FVpC6ICtUgni3N3fl29yHTJV+k6nsWTK Qf98V6Fgbu8Om9gq6exlYA/V74/cjMp9lvyUkaLvED92/EnWLvLTdWCJQ5DhcFVkSCGu0d GAP/VeDzskTN4xcMyscNkF4KMAYVGAQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708782439; a=rsa-sha256; cv=none; b=Ge+bzen9QenKvyzxK/yOddOYESoMz+GAIT7/zZi7qktVLKgJId9TnfInRgkFxRwbKSYVoF PlbMQoIQl8LHo/zS/2HT3+uDmsozNV3HDuH7gSKGciNTytxF1o+8JHAlISVwN+vSockVvM aIGTHv/ZlIg1inDdaF4Jc0xMWB+j0tA= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=PRi3Bq1B; spf=pass (imf07.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.176 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1708782435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=yKqN1sI8hqn9RRCulN4vsVyKZb8ToBpRi5CxTQ7ZeiE=; b=PRi3Bq1B9FbPNMB1z9xmo71ykAJIhO4pCqBW3HUot2pZd4HONcMHQWXBYxWeXWhwxcVwSH r2e/VSZ7c18iWnzvkzgIWdzYykX8De67sfvG9USH+HVIepEd0mju8tH4lhEImqkQr+yWo5 9DsgdK1Y5tf4ZZfSyc5MfaDTKFG0t2w= From: chengming.zhou@linux.dev To: clm@fb.com, josef@toxicpanda.com, dsterba@suse.com Cc: linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, vbabka@suse.cz, roman.gushchin@linux.dev, Xiongwei.Song@windriver.com, chengming.zhou@linux.dev, Chengming Zhou Subject: [PATCH] btrfs: remove SLAB_MEM_SPREAD flag usage Date: Sat, 24 Feb 2024 13:47:09 +0000 Message-Id: <20240224134709.829191-1-chengming.zhou@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 8C58B40007 X-Rspam-User: X-Stat-Signature: kifo5sxrhu5x5y4yc1q9jmg789y8nkfc X-Rspamd-Server: rspam03 X-HE-Tag: 1708782439-455691 X-HE-Meta: U2FsdGVkX18He4fUYKrJIZid0JN5LMW2NHLB4amAeUC9Q2l45/kt9hMZPRUpV2hByNfzXSM1wkbauHv/ejrgICkqECK9IzPc4MPYQ7/voiC1+Vrvsoixr48w1SP386hzuvzEBymuOSk830SjYYrdhuiYEeTzGIJv2WtjfqIY/fRICiKE0buvKHXmuX6RZZiH5CnCOegX4So2vGJtCKQSRcFdEF0FVhkQ6L13F1q0NJ2BUDC5Ru4S2G0WkUOlogFCrGde41PJPWjFuLQMvcqJZMWumAwqFBrrbgi7Yw+iP2s1y/v4pq6+VGYoL+Uk+xk8yLCGAB1YsEbRq7jSWFWDHCw+9xK2Dg5rsnf+fG+Zr6/d3ME8DMjdasXvQiWxSVFKEPg+77t5gyJqI8OYcevgwuGhuOH//X7kMI8FHDetwiyqRzdbDTJno0ZxtoumhJtTw84QTspJWEKGf/wkXBgtCWO8rsWRinE2ALeCQP+SwxXuLzMQUCTG7EeYuxySu8y74maIdmaePSQSZ9oyv4X4tRQnZW67IP2+kHyXzJK8QKTVknSSx96+EmAT8at2RZ5MEAdGqRtrCpSOptHo1Mg4KRGxgpjnGgHrXi+mcQzRJzF6XVzm8/fEdkWZWn03BBRD8UQRduY5E6FYUBo92coHOrvftsP4pToCRC4Bub/7eSc1FijG4N1lFgO5naLxGQ6jm8rkGmE6HdiO10FqeWNM3wdEWeZhMWM8isnbSyF8v0qdG75K3z/id1Ux4SfDSXhzO15z4Lhuo8yMYemMAUuEz/M/36nhbY7kctJmXqQ8wrlT7f7pTg59NPAFfMNXMqCJt/87+mOKkXgV28yScFoff/RrQFxNwobY/czE3VoLk7aP07fGwvdcIGOEuYVus9t7l8Hzri58iTE= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Chengming Zhou 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. Signed-off-by: Chengming Zhou --- 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(-) diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c index 6514cb1d404a..f2abb9afd04a 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c @@ -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; diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index bae17dbe71d6..aaf53fd84358 100644 --- 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 6d3abfcf92d4..4f9e78a94a0a 100644 --- a/fs/btrfs/defrag.c +++ b/fs/btrfs/defrag.c @@ -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; diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index 0a7a40d97e91..dd6f566a383f 100644 --- 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 c90efc20b8b2..7c5377151a1f 100644 --- a/fs/btrfs/delayed-ref.c +++ b/fs/btrfs/delayed-ref.c @@ -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; diff --git a/fs/btrfs/extent-io-tree.c b/fs/btrfs/extent-io-tree.c index 6b923c0ef4ea..102572e31636 100644 --- a/fs/btrfs/extent-io-tree.c +++ b/fs/btrfs/extent-io-tree.c @@ -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; diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index bfef67c68221..e779a85e752f 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -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; diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c index ea08601988de..692d62b2fab2 100644 --- a/fs/btrfs/extent_map.c +++ b/fs/btrfs/extent_map.c @@ -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; diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index d984912dae06..c8a05d5eb9cb 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c @@ -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) { - 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 df55dd891137..6c4d60746af6 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -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; diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c index 1ee2fb8dcd6a..b749ba45da2b 100644 --- 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 ea080ec2f927..2f151c5367ed 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -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;