AFFS update for 6.9
Subsystems (34)
Hi,
please pull one change to AFFS that removes use of SLAB_MEM_SPREAD, which is going to be removed from MM code. Thanks.
----------------------------------------------------------------
The following changes since commit d206a76d7d2726f3b096037f2079ce0bd3ba329b:
Linux 6.8-rc6 (2024-02-25 15:46:06 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git tags/affs-for-6.9
for you to fetch changes up to f7c79a40b575f2b6c156c8bee9a652401bf715b6:
affs: remove SLAB_MEM_SPREAD flag usage (2024-02-26 11:36:28 +0100)
----------------------------------------------------------------
affs-for-6.9
----------------------------------------------------------------
Chengming Zhou (1):
affs: remove SLAB_MEM_SPREAD flag usage
fs/affs/super.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Quoted 3 lines · David Sterba
please pull one change to AFFS that removes use of
SLAB_MEM_SPREAD, which is going to be removed from MM code.
I've pulled this, but I don't really see the point in removing these one by one like this.
SLAB_MEM_SPREAD is already a no-op, the MM people could just do a coccinelle thing to remove it everywhere.
I think you could do 90% even just using a few variations of 'sed', eg variations on
git grep -l 'SLAB_MEM_SPREAD' |
xargs sed -i 's/SLAB_MEM_SPREAD *|//'
git grep -l 'SLAB_MEM_SPREAD' |
xargs sed -i 's/| *SLAB_MEM_SPREAD//'
and then some manual fixups for (a) whitespace cleanup of the result and (b) the couple of cases where it wasn't a bitwise or into other fields (or where the bitwise or was on a different line)
And then you'd end up with something like the attached.
Linus
drivers/dax/super.c | 3 +-- drivers/usb/isp1760/isp1760-hcd.c | 8 +++----- fs/9p/v9fs.c | 2 +- fs/adfs/super.c | 2 +- fs/befs/linuxvfs.c | 3 +-- fs/bfs/inode.c | 2 +- fs/ceph/super.c | 18 +++++++++--------- fs/coda/inode.c | 4 ++-- fs/erofs/super.c | 2 +- fs/exfat/cache.c | 2 +- fs/exfat/super.c | 2 +- fs/ext2/super.c | 3 +-- fs/ext4/super.c | 3 +-- fs/fat/cache.c | 2 +- fs/fat/inode.c | 2 +- fs/freevxfs/vxfs_super.c | 2 +- fs/gfs2/main.c | 1 - fs/hpfs/super.c | 2 +- fs/isofs/inode.c | 2 +- fs/jffs2/super.c | 2 +- fs/nfs/direct.c | 3 +-- fs/nfs/inode.c | 2 +- fs/nfs/nfs42xattr.c | 2 +- fs/ntfs3/super.c | 2 +- fs/ocfs2/dlmfs/dlmfs.c | 2 +- fs/ocfs2/super.c | 7 +++---- fs/overlayfs/super.c | 2 +- fs/qnx4/inode.c | 2 +- fs/quota/dquot.c | 2 +- fs/smb/client/cifsfs.c | 2 +- fs/tracefs/inode.c | 1 - fs/ubifs/super.c | 4 ++-- fs/udf/super.c | 1 - fs/ufs/super.c | 3 +-- fs/vboxsf/super.c | 3 +-- fs/xfs/xfs_super.c | 7 +++---- fs/zonefs/super.c | 2 +- include/linux/slab.h | 2 -- mm/slab.h | 1 - net/socket.c | 2 +- net/sunrpc/rpc_pipe.c | 2 +- 41 files changed, 52 insertions(+), 69 deletions(-)
drivers/dax/super.c +1 -2
@@ -532,8 +532,7 @@ static int dax_fs_init(void)int rc; dax_cache =kmem_cache_create ("dax_cache" ,sizeof (struct dax_device ),0 , - (SLAB_HWCACHE_ALIGN |SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD |SLAB_ACCOUNT ), +SLAB_HWCACHE_ALIGN |SLAB_RECLAIM_ACCOUNT |SLAB_ACCOUNT , init_once);if (!dax_cache)return -ENOMEM ;
drivers/usb/isp1760/isp1760-hcd.c +3 -5
@@ -2521,21 +2521,19 @@ static const struct hc_driver isp1760_hc_driver = {int __init isp1760_init_kmem_once (void ) { urb_listitem_cachep =kmem_cache_create ("isp1760_urb_listitem" , -sizeof (struct urb_listitem ),0 ,SLAB_TEMPORARY | -SLAB_MEM_SPREAD ,NULL ); +sizeof (struct urb_listitem ),0 ,SLAB_TEMPORARY ,NULL );if (!urb_listitem_cachep)return -ENOMEM ; qtd_cachep =kmem_cache_create ("isp1760_qtd" , -sizeof (struct isp1760_qtd ),0 ,SLAB_TEMPORARY | -SLAB_MEM_SPREAD ,NULL ); +sizeof (struct isp1760_qtd ),0 ,SLAB_TEMPORARY ,NULL );if (!qtd_cachep) goto destroy_urb_listitem; qh_cachep =kmem_cache_create ("isp1760_qh" ,sizeof (struct isp1760_qh ), -0 ,SLAB_TEMPORARY |SLAB_MEM_SPREAD ,NULL ); +0 ,SLAB_TEMPORARY ,NULL );if (!qh_cachep) goto destroy_qtd;
fs/9p/v9fs.c +1 -1
@@ -637,7 +637,7 @@ static int v9fs_init_inode_cache(void) v9fs_inode_cache =kmem_cache_create ("v9fs_inode_cache" ,sizeof (struct v9fs_inode ),0 , (SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD |SLAB_ACCOUNT ), +SLAB_ACCOUNT ), v9fs_inode_init_once);if (!v9fs_inode_cache)return -ENOMEM ;
fs/adfs/super.c +1 -1
@@ -249,7 +249,7 @@ static int __init init_inodecache(void) adfs_inode_cachep =kmem_cache_create ("adfs_inode_cache" ,sizeof (struct adfs_inode_info ),0 , (SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD |SLAB_ACCOUNT ), +SLAB_ACCOUNT ), init_once);if (adfs_inode_cachep ==NULL )return -ENOMEM ;
fs/befs/linuxvfs.c +1 -2
@@ -435,8 +435,7 @@ befs_init_inodecache(void) { befs_inode_cachep =kmem_cache_create_usercopy ("befs_inode_cache" ,sizeof (struct befs_inode_info ),0 , - (SLAB_RECLAIM_ACCOUNT |SLAB_MEM_SPREAD | -SLAB_ACCOUNT ), +SLAB_RECLAIM_ACCOUNT |SLAB_ACCOUNT , offsetof(struct befs_inode_info , i_data.symlink), sizeof_field(struct befs_inode_info,
fs/bfs/inode.c +1 -1
@@ -259,7 +259,7 @@ static int __init init_inodecache(void) bfs_inode_cachep =kmem_cache_create ("bfs_inode_cache" ,sizeof (struct bfs_inode_info ),0 , (SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD |SLAB_ACCOUNT ), +SLAB_ACCOUNT ), init_once);if (bfs_inode_cachep ==NULL )return -ENOMEM ;
fs/ceph/super.c +9 -9
@@ -928,36 +928,36 @@ static int __init init_caches(void) ceph_inode_cachep =kmem_cache_create ("ceph_inode_info" ,sizeof (struct ceph_inode_info ), __alignof__(struct ceph_inode_info ), -SLAB_RECLAIM_ACCOUNT |SLAB_MEM_SPREAD | -SLAB_ACCOUNT , ceph_inode_init_once); +SLAB_RECLAIM_ACCOUNT |SLAB_ACCOUNT , + ceph_inode_init_once);if (!ceph_inode_cachep)return -ENOMEM ; - ceph_cap_cachep =KMEM_CACHE (ceph_cap,SLAB_MEM_SPREAD ); + ceph_cap_cachep =KMEM_CACHE (ceph_cap,0 );if (!ceph_cap_cachep) goto bad_cap; - ceph_cap_snap_cachep =KMEM_CACHE (ceph_cap_snap,SLAB_MEM_SPREAD ); + ceph_cap_snap_cachep =KMEM_CACHE (ceph_cap_snap,0 );if (!ceph_cap_snap_cachep) goto bad_cap_snap; ceph_cap_flush_cachep =KMEM_CACHE (ceph_cap_flush, -SLAB_RECLAIM_ACCOUNT |SLAB_MEM_SPREAD ); +SLAB_RECLAIM_ACCOUNT );if (!ceph_cap_flush_cachep) goto bad_cap_flush; ceph_dentry_cachep =KMEM_CACHE (ceph_dentry_info, -SLAB_RECLAIM_ACCOUNT |SLAB_MEM_SPREAD ); +SLAB_RECLAIM_ACCOUNT );if (!ceph_dentry_cachep) goto bad_dentry; - ceph_file_cachep =KMEM_CACHE (ceph_file_info,SLAB_MEM_SPREAD ); + ceph_file_cachep =KMEM_CACHE (ceph_file_info,0 );if (!ceph_file_cachep) goto bad_file; - ceph_dir_file_cachep =KMEM_CACHE (ceph_dir_file_info,SLAB_MEM_SPREAD ); + ceph_dir_file_cachep =KMEM_CACHE (ceph_dir_file_info,0 );if (!ceph_dir_file_cachep) goto bad_dir_file; - ceph_mds_request_cachep =KMEM_CACHE (ceph_mds_request,SLAB_MEM_SPREAD ); + ceph_mds_request_cachep =KMEM_CACHE (ceph_mds_request,0 );if (!ceph_mds_request_cachep) goto bad_mds_req;
fs/coda/inode.c +2 -2
@@ -72,8 +72,8 @@ int __init coda_init_inodecache(void) { coda_inode_cachep =kmem_cache_create ("coda_inode_cache" ,sizeof (struct coda_inode_info ),0 , -SLAB_RECLAIM_ACCOUNT |SLAB_MEM_SPREAD | -SLAB_ACCOUNT , init_once); +SLAB_RECLAIM_ACCOUNT |SLAB_ACCOUNT , + init_once);if (coda_inode_cachep ==NULL )return -ENOMEM ;return 0 ;
fs/erofs/super.c +1 -1
@@ -885,7 +885,7 @@ static int __init erofs_module_init(void) erofs_inode_cachep =kmem_cache_create ("erofs_inode" ,sizeof (struct erofs_inode ),0 , -SLAB_RECLAIM_ACCOUNT |SLAB_MEM_SPREAD |SLAB_ACCOUNT , +SLAB_RECLAIM_ACCOUNT |SLAB_ACCOUNT , erofs_inode_init_once);if (!erofs_inode_cachep)return -ENOMEM ;
fs/exfat/cache.c +1 -1
@@ -46,7 +46,7 @@ int exfat_cache_init(void) { exfat_cachep =kmem_cache_create ("exfat_cache" ,sizeof (struct exfat_cache ), -0 ,SLAB_RECLAIM_ACCOUNT |SLAB_MEM_SPREAD , +0 ,SLAB_RECLAIM_ACCOUNT , exfat_cache_init_once);if (!exfat_cachep)return -ENOMEM ;
fs/exfat/super.c +1 -1
@@ -813,7 +813,7 @@ static int __init init_exfat_fs(void) exfat_inode_cachep =kmem_cache_create ("exfat_inode_cache" ,sizeof (struct exfat_inode_info ), -0 ,SLAB_RECLAIM_ACCOUNT |SLAB_MEM_SPREAD , +0 ,SLAB_RECLAIM_ACCOUNT , exfat_inode_init_once);if (!exfat_inode_cachep) { err = -ENOMEM ;
fs/ext2/super.c +1 -2
@@ -213,8 +213,7 @@ static int __init init_inodecache(void) { ext2_inode_cachep =kmem_cache_create_usercopy ("ext2_inode_cache" ,sizeof (struct ext2_inode_info ),0 , - (SLAB_RECLAIM_ACCOUNT |SLAB_MEM_SPREAD | -SLAB_ACCOUNT ), +SLAB_RECLAIM_ACCOUNT |SLAB_ACCOUNT , offsetof(struct ext2_inode_info , i_data), sizeof_field(struct ext2_inode_info, i_data), init_once);
fs/ext4/super.c +1 -2
@@ -1500,8 +1500,7 @@ static int __init init_inodecache(void) { ext4_inode_cachep =kmem_cache_create_usercopy ("ext4_inode_cache" ,sizeof (struct ext4_inode_info ),0 , - (SLAB_RECLAIM_ACCOUNT |SLAB_MEM_SPREAD | -SLAB_ACCOUNT ), +SLAB_RECLAIM_ACCOUNT |SLAB_ACCOUNT , offsetof(struct ext4_inode_info , i_data), sizeof_field(struct ext4_inode_info, i_data), init_once);
fs/fat/cache.c +1 -1
@@ -47,7 +47,7 @@ int __init fat_cache_init(void) { fat_cache_cachep =kmem_cache_create ("fat_cache" ,sizeof (struct fat_cache ), -0 ,SLAB_RECLAIM_ACCOUNT |SLAB_MEM_SPREAD , +0 ,SLAB_RECLAIM_ACCOUNT , init_once);if (fat_cache_cachep ==NULL )return -ENOMEM ;
fs/fat/inode.c +1 -1
@@ -787,7 +787,7 @@ static int __init fat_init_inodecache(void) fat_inode_cachep =kmem_cache_create ("fat_inode_cache" ,sizeof (struct msdos_inode_info ),0 , (SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD |SLAB_ACCOUNT ), +SLAB_ACCOUNT ), init_once);if (fat_inode_cachep ==NULL )return -ENOMEM ;
fs/freevxfs/vxfs_super.c +1 -1
@@ -307,7 +307,7 @@ vxfs_init(void) vxfs_inode_cachep =kmem_cache_create_usercopy ("vxfs_inode" ,sizeof (struct vxfs_inode_info ),0 , -SLAB_RECLAIM_ACCOUNT |SLAB_MEM_SPREAD , +SLAB_RECLAIM_ACCOUNT , offsetof(struct vxfs_inode_info, vii_immed.vi_immed), sizeof_field(struct vxfs_inode_info, vii_immed.vi_immed),
fs/gfs2/main.c +0 -1
@@ -111,7 +111,6 @@ static int __init init_gfs2_fs(void) gfs2_inode_cachep =kmem_cache_create ("gfs2_inode" ,sizeof (struct gfs2_inode ),0 ,SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD |SLAB_ACCOUNT , gfs2_init_inode_once);if (!gfs2_inode_cachep)
fs/hpfs/super.c +1 -1
@@ -255,7 +255,7 @@ static int init_inodecache(void) hpfs_inode_cachep =kmem_cache_create ("hpfs_inode_cache" ,sizeof (struct hpfs_inode_info ),0 , (SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD |SLAB_ACCOUNT ), +SLAB_ACCOUNT ), init_once);if (hpfs_inode_cachep ==NULL )return -ENOMEM ;
fs/isofs/inode.c +1 -1
@@ -93,7 +93,7 @@ static int __init init_inodecache(void) isofs_inode_cachep =kmem_cache_create ("isofs_inode_cache" ,sizeof (struct iso_inode_info ),0 , (SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD |SLAB_ACCOUNT ), +SLAB_ACCOUNT ), init_once);if (!isofs_inode_cachep)return -ENOMEM ;
fs/jffs2/super.c +1 -1
@@ -387,7 +387,7 @@ static int __init init_jffs2_fs(void) jffs2_inode_cachep =kmem_cache_create ("jffs2_i" ,sizeof (struct jffs2_inode_info ),0 , (SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD |SLAB_ACCOUNT ), +SLAB_ACCOUNT ), jffs2_i_init_once);if (!jffs2_inode_cachep) {pr_err ("error: Failed to initialise inode cache\n" );
fs/nfs/direct.c +1 -2
@@ -1037,8 +1037,7 @@ int __init nfs_init_directcache(void) { nfs_direct_cachep =kmem_cache_create ("nfs_direct_cache" ,sizeof (struct nfs_direct_req ), -0 , (SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD ), +0 ,SLAB_RECLAIM_ACCOUNT ,NULL );if (nfs_direct_cachep ==NULL )return -ENOMEM ;
fs/nfs/inode.c +1 -1
@@ -2372,7 +2372,7 @@ static int __init nfs_init_inodecache(void) nfs_inode_cachep =kmem_cache_create ("nfs_inode_cache" ,sizeof (struct nfs_inode ),0 , (SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD |SLAB_ACCOUNT ), +SLAB_ACCOUNT ), init_once);if (nfs_inode_cachep ==NULL )return -ENOMEM ;
fs/nfs/nfs42xattr.c +1 -1
@@ -1017,7 +1017,7 @@ int __init nfs4_xattr_cache_init(void) nfs4_xattr_cache_cachep =kmem_cache_create ("nfs4_xattr_cache_cache" ,sizeof (struct nfs4_xattr_cache ),0 , - (SLAB_RECLAIM_ACCOUNT |SLAB_MEM_SPREAD ), + (SLAB_RECLAIM_ACCOUNT ), nfs4_xattr_cache_init_once);if (nfs4_xattr_cache_cachep ==NULL )return -ENOMEM ;
fs/ntfs3/super.c +1 -1
@@ -1825,7 +1825,7 @@ static int __init init_ntfs_fs(void) ntfs_inode_cachep =kmem_cache_create ("ntfs_inode_cache" ,sizeof (struct ntfs_inode ),0 , - (SLAB_RECLAIM_ACCOUNT |SLAB_MEM_SPREAD |SLAB_ACCOUNT ), + (SLAB_RECLAIM_ACCOUNT |SLAB_ACCOUNT ), init_once);if (!ntfs_inode_cachep) { err = -ENOMEM ;
fs/ocfs2/dlmfs/dlmfs.c +1 -1
@@ -578,7 +578,7 @@ static int __init init_dlmfs_fs(void) dlmfs_inode_cache =kmem_cache_create ("dlmfs_inode_cache" ,sizeof (struct dlmfs_inode_private ),0 , (SLAB_HWCACHE_ALIGN |SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD |SLAB_ACCOUNT ), +SLAB_ACCOUNT ), dlmfs_init_once);if (!dlmfs_inode_cache) { status = -ENOMEM ;
fs/ocfs2/super.c +3 -4
@@ -1706,18 +1706,17 @@ static int ocfs2_initialize_mem_caches(void)sizeof (struct ocfs2_inode_info ),0 , (SLAB_HWCACHE_ALIGN |SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD |SLAB_ACCOUNT ), +SLAB_ACCOUNT ), ocfs2_inode_init_once); ocfs2_dquot_cachep =kmem_cache_create ("ocfs2_dquot_cache" ,sizeof (struct ocfs2_dquot ),0 , - (SLAB_HWCACHE_ALIGN |SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD ), + (SLAB_HWCACHE_ALIGN |SLAB_RECLAIM_ACCOUNT ),NULL ); ocfs2_qf_chunk_cachep =kmem_cache_create ("ocfs2_qf_chunk_cache" ,sizeof (struct ocfs2_quota_chunk ),0 , - (SLAB_RECLAIM_ACCOUNT |SLAB_MEM_SPREAD ), + (SLAB_RECLAIM_ACCOUNT ),NULL );if (!ocfs2_inode_cachep || !ocfs2_dquot_cachep || !ocfs2_qf_chunk_cachep) {
fs/overlayfs/super.c +1 -1
@@ -1503,7 +1503,7 @@ static int __init ovl_init(void) ovl_inode_cachep =kmem_cache_create ("ovl_inode" ,sizeof (struct ovl_inode ),0 , (SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD |SLAB_ACCOUNT ), +SLAB_ACCOUNT ), ovl_inode_init_once);if (ovl_inode_cachep ==NULL )return -ENOMEM ;
fs/qnx4/inode.c +1 -1
@@ -378,7 +378,7 @@ static int init_inodecache(void) qnx4_inode_cachep =kmem_cache_create ("qnx4_inode_cache" ,sizeof (struct qnx4_inode_info ),0 , (SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD |SLAB_ACCOUNT ), +SLAB_ACCOUNT ), init_once);if (qnx4_inode_cachep ==NULL )return -ENOMEM ;
fs/quota/dquot.c +1 -1
@@ -2984,7 +2984,7 @@ static int __init dquot_init(void) dquot_cachep =kmem_cache_create ("dquot" ,sizeof (struct dquot ),sizeof (unsigned long ) *4 , (SLAB_HWCACHE_ALIGN |SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD |SLAB_PANIC ), +SLAB_PANIC ),NULL ); order =0 ;
fs/smb/client/cifsfs.c +1 -1
@@ -1664,7 +1664,7 @@ cifs_init_inodecache(void) cifs_inode_cachep =kmem_cache_create ("cifs_inode_cache" ,sizeof (struct cifsInodeInfo ),0 , (SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD |SLAB_ACCOUNT ), +SLAB_ACCOUNT ), cifs_init_once);if (cifs_inode_cachep ==NULL )return -ENOMEM ;
fs/tracefs/inode.c +0 -1
@@ -731,7 +731,6 @@ static int __init tracefs_init(void) tracefs_inode_cachep =kmem_cache_create ("tracefs_inode_cache" ,sizeof (struct tracefs_inode ),0 , (SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD |SLAB_ACCOUNT ), init_once);if (!tracefs_inode_cachep)
fs/ubifs/super.c +2 -2
@@ -2434,8 +2434,8 @@ static int __init ubifs_init(void) ubifs_inode_slab =kmem_cache_create ("ubifs_inode_slab" ,sizeof (struct ubifs_inode ),0 , -SLAB_MEM_SPREAD |SLAB_RECLAIM_ACCOUNT | -SLAB_ACCOUNT , &inode_slab_ctor); +SLAB_RECLAIM_ACCOUNT |SLAB_ACCOUNT , + &inode_slab_ctor);if (!ubifs_inode_slab)return -ENOMEM ;
fs/udf/super.c +0 -1
@@ -177,7 +177,6 @@ static int __init init_inodecache(void) udf_inode_cachep =kmem_cache_create ("udf_inode_cache" ,sizeof (struct udf_inode_info ),0 , (SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD |SLAB_ACCOUNT ), init_once);if (!udf_inode_cachep)
fs/ufs/super.c +1 -2
@@ -1470,8 +1470,7 @@ static int __init init_inodecache(void) { ufs_inode_cachep =kmem_cache_create_usercopy ("ufs_inode_cache" ,sizeof (struct ufs_inode_info ),0 , - (SLAB_RECLAIM_ACCOUNT |SLAB_MEM_SPREAD | -SLAB_ACCOUNT ), + (SLAB_RECLAIM_ACCOUNT |SLAB_ACCOUNT ), offsetof(struct ufs_inode_info, i_u1.i_symlink), sizeof_field(struct ufs_inode_info, i_u1.i_symlink),
fs/vboxsf/super.c +1 -2
@@ -339,8 +339,7 @@ static int vboxsf_setup(void) vboxsf_inode_cachep =kmem_cache_create ("vboxsf_inode_cache" ,sizeof (struct vboxsf_inode ),0 , - (SLAB_RECLAIM_ACCOUNT |SLAB_MEM_SPREAD | -SLAB_ACCOUNT ), +SLAB_RECLAIM_ACCOUNT |SLAB_ACCOUNT , vboxsf_inode_init_once);if (!vboxsf_inode_cachep) { err = -ENOMEM ;
fs/xfs/xfs_super.c +3 -4
@@ -2043,8 +2043,7 @@ xfs_init_caches(void) xfs_buf_cache =kmem_cache_create ("xfs_buf" ,sizeof (struct xfs_buf ),0 ,SLAB_HWCACHE_ALIGN | -SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD , +SLAB_RECLAIM_ACCOUNT ,NULL );if (!xfs_buf_cache) goto out;
@@ -2109,14 +2108,14 @@ xfs_init_caches(void)sizeof (struct xfs_inode ),0 , (SLAB_HWCACHE_ALIGN |SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD |SLAB_ACCOUNT ), +SLAB_ACCOUNT ), xfs_fs_inode_init_once);if (!xfs_inode_cache) goto out_destroy_efi_cache; xfs_ili_cache =kmem_cache_create ("xfs_ili" ,sizeof (struct xfs_inode_log_item ),0 , -SLAB_RECLAIM_ACCOUNT |SLAB_MEM_SPREAD , +SLAB_RECLAIM_ACCOUNT ,NULL );if (!xfs_ili_cache) goto out_destroy_inode_cache;
fs/zonefs/super.c +1 -1
@@ -1422,7 +1422,7 @@ static int __init zonefs_init_inodecache(void) { zonefs_inode_cachep =kmem_cache_create ("zonefs_inode_cache" ,sizeof (struct zonefs_inode_info ),0 , - (SLAB_RECLAIM_ACCOUNT |SLAB_MEM_SPREAD |SLAB_ACCOUNT ), +SLAB_RECLAIM_ACCOUNT |SLAB_ACCOUNT ,NULL );if (zonefs_inode_cachep ==NULL )return -ENOMEM ;
include/linux/slab.h +0 -2
@@ -96,8 +96,6 @@*/ /* Defer freeing slabs to RCU */ #define SLAB_TYPESAFE_BY_RCU ((slab_flags_t __force)0x00080000U) -/* Spread some memory over cpuset */ -#define SLAB_MEM_SPREAD ((slab_flags_t __force)0x00100000U)/* Trace allocations and frees */ #define SLAB_TRACE ((slab_flags_t __force)0x00200000U)
mm/slab.h +0 -1
@@ -469,7 +469,6 @@ static inline bool is_kmalloc_cache(struct kmem_cache *s)SLAB_STORE_USER | \SLAB_TRACE | \SLAB_CONSISTENCY_CHECKS | \ -SLAB_MEM_SPREAD | \SLAB_NOLEAKTRACE | \SLAB_RECLAIM_ACCOUNT | \ SLAB_TEMPORARY | \
net/socket.c +1 -1
@@ -343,7 +343,7 @@ static void init_inodecache(void)0 , (SLAB_HWCACHE_ALIGN |SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD |SLAB_ACCOUNT ), +SLAB_ACCOUNT ), init_once);BUG_ON (sock_inode_cachep ==NULL ); }
net/sunrpc/rpc_pipe.c +1 -1
@@ -1490,7 +1490,7 @@ int register_rpc_pipefs(void) rpc_inode_cachep =kmem_cache_create ("rpc_inode_cache" ,sizeof (struct rpc_inode ),0 , (SLAB_HWCACHE_ALIGN |SLAB_RECLAIM_ACCOUNT | -SLAB_MEM_SPREAD |SLAB_ACCOUNT ), +SLAB_ACCOUNT ), init_once);if (!rpc_inode_cachep)return -ENOMEM ;
Quoted 10 lines · Linus Torvalds
Quoted 3 lines · David Sterba
please pull one change to AFFS that removes use of
SLAB_MEM_SPREAD, which is going to be removed from MM code.I've pulled this, but I don't really see the point in removing these one by one like this.
SLAB_MEM_SPREADis already a no-op, the MM people could just do a coccinelle thing to remove it everywhere.
That's of course valid and was also suggested as an option. However I would prefer to let actively maintained code pick the patches first and then do the rest as sed or coccinelle script. This usually leaves whitespace damage behind and not everybody takes the care to fix it manually.
I agree that for AFFS it's a bit too much for just one change but I did not realize that as I happened to do the same change for btrfs.
Quoted 6 lines
I think you could do 90% even just using a few variations of 'sed', eg variations on
git grep -l '
SLAB_MEM_SPREAD' |xargs sed -i 's/SLAB_MEM_SPREAD *|//'
Quoted 8 lines
git grep -l '
SLAB_MEM_SPREAD' |xargs sed -i 's/| *SLAB_MEM_SPREAD//'and then some manual fixups for (a) whitespace cleanup of the result and (b) the couple of cases where it wasn't a bitwise or into other fields (or where the bitwise or was on a different line)
And then you'd end up with something like the attached.
I don't know if MM people have such change queued but you could apply the diff at the end of 6.9, the formatting seems OK.
The pull request you sent on Mon, 11 Mar 2024 20:30:38 +0100:
The pull request you sent on Mon, 11 Mar 2024 20:30:38 +0100:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.gittags/affs-for-6.9
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/cbcb9b5bc9804c2e803f00a460c212f9a0bbdb0d
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/prtracker.html