Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 21:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

mm, slab: remove last vestiges of SLAB_MEM_SPREAD

Browse Source 
Yes, yes, I know the slab people were planning on going slow and letting
every subsystem fight this thing on their own.  But let's just rip off
the band-aid and get it over and done with.  I don't want to see a
number of unnecessary pull requests just to get rid of a flag that no
longer has any meaning.

This was mainly done with a couple of 'sed' scripts and then some manual
cleanup of the end result.

Link: https://lore.kernel.org/all/CAHk-=wji0u+OOtmAOD-5JV3SXcRJF___k_+8XNKmak0yd5vW1Q@mail.gmail.com/
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2024-03-12 20:32:19 -07:00
parent 0ea680eda6
commit f88c3fb81c
39 changed files with 51 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/dax/super.c
View File

@ -532,8 +532,7 @@ static int dax_fs_init(void)
int rc; int rc;
dax_cache = kmem_cache_create("dax_cache", sizeof(struct dax_device), 0, dax_cache = kmem_cache_create("dax_cache", sizeof(struct dax_device), 0,
(SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| SLAB_HWCACHE_ALIGN | SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,
SLAB_MEM_SPREAD|SLAB_ACCOUNT),
init_once); init_once);
if (!dax_cache) if (!dax_cache)
return -ENOMEM; return -ENOMEM;

8
drivers/usb/isp1760/isp1760-hcd.c
View File

@ -2521,21 +2521,19 @@ static const struct hc_driver isp1760_hc_driver = {
int __init isp1760_init_kmem_once(void) int __init isp1760_init_kmem_once(void)
{ {
urb_listitem_cachep = kmem_cache_create("isp1760_urb_listitem", urb_listitem_cachep = kmem_cache_create("isp1760_urb_listitem",
sizeof(struct urb_listitem), 0, SLAB_TEMPORARY | sizeof(struct urb_listitem), 0, SLAB_TEMPORARY, NULL);
SLAB_MEM_SPREAD, NULL);
if (!urb_listitem_cachep) if (!urb_listitem_cachep)
return -ENOMEM; return -ENOMEM;
qtd_cachep = kmem_cache_create("isp1760_qtd", qtd_cachep = kmem_cache_create("isp1760_qtd",
sizeof(struct isp1760_qtd), 0, SLAB_TEMPORARY | sizeof(struct isp1760_qtd), 0, SLAB_TEMPORARY, NULL);
SLAB_MEM_SPREAD, NULL);
if (!qtd_cachep) if (!qtd_cachep)
goto destroy_urb_listitem; goto destroy_urb_listitem;
qh_cachep = kmem_cache_create("isp1760_qh", sizeof(struct isp1760_qh), 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) if (!qh_cachep)
goto destroy_qtd; goto destroy_qtd;

2
fs/9p/v9fs.c
View File

@ -637,7 +637,7 @@ static int v9fs_init_inode_cache(void)
v9fs_inode_cache = kmem_cache_create("v9fs_inode_cache", v9fs_inode_cache = kmem_cache_create("v9fs_inode_cache",
sizeof(struct v9fs_inode), sizeof(struct v9fs_inode),
0, (SLAB_RECLAIM_ACCOUNT| 0, (SLAB_RECLAIM_ACCOUNT|
SLAB_MEM_SPREAD|SLAB_ACCOUNT), SLAB_ACCOUNT),
v9fs_inode_init_once); v9fs_inode_init_once);
if (!v9fs_inode_cache) if (!v9fs_inode_cache)
return -ENOMEM; return -ENOMEM;

2
fs/adfs/super.c
View File

@ -249,7 +249,7 @@ static int __init init_inodecache(void)
adfs_inode_cachep = kmem_cache_create("adfs_inode_cache", adfs_inode_cachep = kmem_cache_create("adfs_inode_cache",
sizeof(struct adfs_inode_info), sizeof(struct adfs_inode_info),
0, (SLAB_RECLAIM_ACCOUNT| 0, (SLAB_RECLAIM_ACCOUNT|
SLAB_MEM_SPREAD|SLAB_ACCOUNT), SLAB_ACCOUNT),
init_once); init_once);
if (adfs_inode_cachep == NULL) if (adfs_inode_cachep == NULL)
return -ENOMEM; return -ENOMEM;

3
fs/befs/linuxvfs.c
View File

@ -435,8 +435,7 @@ befs_init_inodecache(void)
{ {
befs_inode_cachep = kmem_cache_create_usercopy("befs_inode_cache", befs_inode_cachep = kmem_cache_create_usercopy("befs_inode_cache",
sizeof(struct befs_inode_info), 0, sizeof(struct befs_inode_info), 0,
(SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD| SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,
SLAB_ACCOUNT),
offsetof(struct befs_inode_info, offsetof(struct befs_inode_info,
i_data.symlink), i_data.symlink),
sizeof_field(struct befs_inode_info, sizeof_field(struct befs_inode_info,

2
fs/bfs/inode.c
View File

@ -259,7 +259,7 @@ static int __init init_inodecache(void)
bfs_inode_cachep = kmem_cache_create("bfs_inode_cache", bfs_inode_cachep = kmem_cache_create("bfs_inode_cache",
sizeof(struct bfs_inode_info), sizeof(struct bfs_inode_info),
0, (SLAB_RECLAIM_ACCOUNT| 0, (SLAB_RECLAIM_ACCOUNT|
SLAB_MEM_SPREAD|SLAB_ACCOUNT), SLAB_ACCOUNT),
init_once); init_once);
if (bfs_inode_cachep == NULL) if (bfs_inode_cachep == NULL)
return -ENOMEM; return -ENOMEM;

18
fs/ceph/super.c
View File

@ -928,36 +928,36 @@ static int __init init_caches(void)
ceph_inode_cachep = kmem_cache_create("ceph_inode_info", ceph_inode_cachep = kmem_cache_create("ceph_inode_info",
sizeof(struct ceph_inode_info), sizeof(struct ceph_inode_info),
__alignof__(struct ceph_inode_info), __alignof__(struct ceph_inode_info),
SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD| SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,
SLAB_ACCOUNT, ceph_inode_init_once); ceph_inode_init_once);
if (!ceph_inode_cachep) if (!ceph_inode_cachep)
return -ENOMEM; return -ENOMEM;
ceph_cap_cachep = KMEM_CACHE(ceph_cap, SLAB_MEM_SPREAD); ceph_cap_cachep = KMEM_CACHE(ceph_cap, 0);
if (!ceph_cap_cachep) if (!ceph_cap_cachep)
goto bad_cap; 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) if (!ceph_cap_snap_cachep)
goto bad_cap_snap; goto bad_cap_snap;
ceph_cap_flush_cachep = KMEM_CACHE(ceph_cap_flush, ceph_cap_flush_cachep = KMEM_CACHE(ceph_cap_flush,
SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD); SLAB_RECLAIM_ACCOUNT);
if (!ceph_cap_flush_cachep) if (!ceph_cap_flush_cachep)
goto bad_cap_flush; goto bad_cap_flush;
ceph_dentry_cachep = KMEM_CACHE(ceph_dentry_info, ceph_dentry_cachep = KMEM_CACHE(ceph_dentry_info,
SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD); SLAB_RECLAIM_ACCOUNT);
if (!ceph_dentry_cachep) if (!ceph_dentry_cachep)
goto bad_dentry; 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) if (!ceph_file_cachep)
goto bad_file; 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) if (!ceph_dir_file_cachep)
goto bad_dir_file; 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) if (!ceph_mds_request_cachep)
goto bad_mds_req; goto bad_mds_req;

4
fs/coda/inode.c
View File

@ -72,8 +72,8 @@ int __init coda_init_inodecache(void)
{ {
coda_inode_cachep = kmem_cache_create("coda_inode_cache", coda_inode_cachep = kmem_cache_create("coda_inode_cache",
sizeof(struct coda_inode_info), 0, sizeof(struct coda_inode_info), 0,
SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD| SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,
SLAB_ACCOUNT, init_once); init_once);
if (coda_inode_cachep == NULL) if (coda_inode_cachep == NULL)
return -ENOMEM; return -ENOMEM;
return 0; return 0;

2
fs/erofs/super.c
View File

@ -857,7 +857,7 @@ static int __init erofs_module_init(void)
erofs_inode_cachep = kmem_cache_create("erofs_inode", erofs_inode_cachep = kmem_cache_create("erofs_inode",
sizeof(struct erofs_inode), 0, sizeof(struct erofs_inode), 0,
SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD | SLAB_ACCOUNT, SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,
erofs_inode_init_once); erofs_inode_init_once);
if (!erofs_inode_cachep) if (!erofs_inode_cachep)
return -ENOMEM; return -ENOMEM;

2
fs/exfat/cache.c
View File

@ -46,7 +46,7 @@ int exfat_cache_init(void)
{ {
exfat_cachep = kmem_cache_create("exfat_cache", exfat_cachep = kmem_cache_create("exfat_cache",
sizeof(struct exfat_cache), sizeof(struct exfat_cache),
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, 0, SLAB_RECLAIM_ACCOUNT,
exfat_cache_init_once); exfat_cache_init_once);
if (!exfat_cachep) if (!exfat_cachep)
return -ENOMEM; return -ENOMEM;

2
fs/exfat/super.c
View File

@ -813,7 +813,7 @@ static int __init init_exfat_fs(void)
exfat_inode_cachep = kmem_cache_create("exfat_inode_cache", exfat_inode_cachep = kmem_cache_create("exfat_inode_cache",
sizeof(struct exfat_inode_info), sizeof(struct exfat_inode_info),
0, SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD, 0, SLAB_RECLAIM_ACCOUNT,
exfat_inode_init_once); exfat_inode_init_once);
if (!exfat_inode_cachep) { if (!exfat_inode_cachep) {
err = -ENOMEM; err = -ENOMEM;

3
fs/ext2/super.c
View File

@ -213,8 +213,7 @@ static int __init init_inodecache(void)
{ {
ext2_inode_cachep = kmem_cache_create_usercopy("ext2_inode_cache", ext2_inode_cachep = kmem_cache_create_usercopy("ext2_inode_cache",
sizeof(struct ext2_inode_info), 0, sizeof(struct ext2_inode_info), 0,
(SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD| SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,
SLAB_ACCOUNT),
offsetof(struct ext2_inode_info, i_data), offsetof(struct ext2_inode_info, i_data),
sizeof_field(struct ext2_inode_info, i_data), sizeof_field(struct ext2_inode_info, i_data),
init_once); init_once);

3
fs/ext4/super.c
View File

@ -1500,8 +1500,7 @@ static int __init init_inodecache(void)
{ {
ext4_inode_cachep = kmem_cache_create_usercopy("ext4_inode_cache", ext4_inode_cachep = kmem_cache_create_usercopy("ext4_inode_cache",
sizeof(struct ext4_inode_info), 0, sizeof(struct ext4_inode_info), 0,
(SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD| SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,
SLAB_ACCOUNT),
offsetof(struct ext4_inode_info, i_data), offsetof(struct ext4_inode_info, i_data),
sizeof_field(struct ext4_inode_info, i_data), sizeof_field(struct ext4_inode_info, i_data),
init_once); init_once);

2
fs/fat/cache.c
View File

@ -47,7 +47,7 @@ int __init fat_cache_init(void)
{ {
fat_cache_cachep = kmem_cache_create("fat_cache", fat_cache_cachep = kmem_cache_create("fat_cache",
sizeof(struct fat_cache), sizeof(struct fat_cache),
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, 0, SLAB_RECLAIM_ACCOUNT,
init_once); init_once);
if (fat_cache_cachep == NULL) if (fat_cache_cachep == NULL)
return -ENOMEM; return -ENOMEM;

2
fs/fat/inode.c
View File

@ -787,7 +787,7 @@ static int __init fat_init_inodecache(void)
fat_inode_cachep = kmem_cache_create("fat_inode_cache", fat_inode_cachep = kmem_cache_create("fat_inode_cache",
sizeof(struct msdos_inode_info), sizeof(struct msdos_inode_info),
0, (SLAB_RECLAIM_ACCOUNT| 0, (SLAB_RECLAIM_ACCOUNT|
SLAB_MEM_SPREAD|SLAB_ACCOUNT), SLAB_ACCOUNT),
init_once); init_once);
if (fat_inode_cachep == NULL) if (fat_inode_cachep == NULL)
return -ENOMEM; return -ENOMEM;

2
fs/freevxfs/vxfs_super.c
View File

@ -307,7 +307,7 @@ vxfs_init(void)
vxfs_inode_cachep = kmem_cache_create_usercopy("vxfs_inode", vxfs_inode_cachep = kmem_cache_create_usercopy("vxfs_inode",
sizeof(struct vxfs_inode_info), 0, sizeof(struct vxfs_inode_info), 0,
SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, SLAB_RECLAIM_ACCOUNT,
offsetof(struct vxfs_inode_info, vii_immed.vi_immed), offsetof(struct vxfs_inode_info, vii_immed.vi_immed),
sizeof_field(struct vxfs_inode_info, sizeof_field(struct vxfs_inode_info,
vii_immed.vi_immed), vii_immed.vi_immed),

1
fs/gfs2/main.c
View File

@ -111,7 +111,6 @@ static int __init init_gfs2_fs(void)
gfs2_inode_cachep = kmem_cache_create("gfs2_inode", gfs2_inode_cachep = kmem_cache_create("gfs2_inode",
sizeof(struct gfs2_inode), sizeof(struct gfs2_inode),
0, SLAB_RECLAIM_ACCOUNT| 0, SLAB_RECLAIM_ACCOUNT|
SLAB_MEM_SPREAD|
SLAB_ACCOUNT, SLAB_ACCOUNT,
gfs2_init_inode_once); gfs2_init_inode_once);
if (!gfs2_inode_cachep) if (!gfs2_inode_cachep)

2
fs/hpfs/super.c
View File

@ -255,7 +255,7 @@ static int init_inodecache(void)
hpfs_inode_cachep = kmem_cache_create("hpfs_inode_cache", hpfs_inode_cachep = kmem_cache_create("hpfs_inode_cache",
sizeof(struct hpfs_inode_info), sizeof(struct hpfs_inode_info),
0, (SLAB_RECLAIM_ACCOUNT| 0, (SLAB_RECLAIM_ACCOUNT|
SLAB_MEM_SPREAD|SLAB_ACCOUNT), SLAB_ACCOUNT),
init_once); init_once);
if (hpfs_inode_cachep == NULL) if (hpfs_inode_cachep == NULL)
return -ENOMEM; return -ENOMEM;

2
fs/isofs/inode.c
View File

@ -93,7 +93,7 @@ static int __init init_inodecache(void)
isofs_inode_cachep = kmem_cache_create("isofs_inode_cache", isofs_inode_cachep = kmem_cache_create("isofs_inode_cache",
sizeof(struct iso_inode_info), sizeof(struct iso_inode_info),
0, (SLAB_RECLAIM_ACCOUNT| 0, (SLAB_RECLAIM_ACCOUNT|
SLAB_MEM_SPREAD|SLAB_ACCOUNT), SLAB_ACCOUNT),
init_once); init_once);
if (!isofs_inode_cachep) if (!isofs_inode_cachep)
return -ENOMEM; return -ENOMEM;

2
fs/jffs2/super.c
View File

@ -387,7 +387,7 @@ static int __init init_jffs2_fs(void)
jffs2_inode_cachep = kmem_cache_create("jffs2_i", jffs2_inode_cachep = kmem_cache_create("jffs2_i",
sizeof(struct jffs2_inode_info), sizeof(struct jffs2_inode_info),
0, (SLAB_RECLAIM_ACCOUNT| 0, (SLAB_RECLAIM_ACCOUNT|
SLAB_MEM_SPREAD|SLAB_ACCOUNT), SLAB_ACCOUNT),
jffs2_i_init_once); jffs2_i_init_once);
if (!jffs2_inode_cachep) { if (!jffs2_inode_cachep) {
pr_err("error: Failed to initialise inode cache\n"); pr_err("error: Failed to initialise inode cache\n");

3
fs/nfs/direct.c
View File

@ -1037,8 +1037,7 @@ int __init nfs_init_directcache(void)
{ {
nfs_direct_cachep = kmem_cache_create("nfs_direct_cache", nfs_direct_cachep = kmem_cache_create("nfs_direct_cache",
sizeof(struct nfs_direct_req), sizeof(struct nfs_direct_req),
0, (SLAB_RECLAIM_ACCOUNT| 0, SLAB_RECLAIM_ACCOUNT,
SLAB_MEM_SPREAD),
NULL); NULL);
if (nfs_direct_cachep == NULL) if (nfs_direct_cachep == NULL)
return -ENOMEM; return -ENOMEM;

2
fs/nfs/inode.c
View File

@ -2372,7 +2372,7 @@ static int __init nfs_init_inodecache(void)
nfs_inode_cachep = kmem_cache_create("nfs_inode_cache", nfs_inode_cachep = kmem_cache_create("nfs_inode_cache",
sizeof(struct nfs_inode), sizeof(struct nfs_inode),
0, (SLAB_RECLAIM_ACCOUNT| 0, (SLAB_RECLAIM_ACCOUNT|
SLAB_MEM_SPREAD|SLAB_ACCOUNT), SLAB_ACCOUNT),
init_once); init_once);
if (nfs_inode_cachep == NULL) if (nfs_inode_cachep == NULL)
return -ENOMEM; return -ENOMEM;

2
fs/nfs/nfs42xattr.c
View File

@ -1017,7 +1017,7 @@ int __init nfs4_xattr_cache_init(void)
nfs4_xattr_cache_cachep = kmem_cache_create("nfs4_xattr_cache_cache", nfs4_xattr_cache_cachep = kmem_cache_create("nfs4_xattr_cache_cache",
sizeof(struct nfs4_xattr_cache), 0, sizeof(struct nfs4_xattr_cache), 0,
(SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD), (SLAB_RECLAIM_ACCOUNT),
nfs4_xattr_cache_init_once); nfs4_xattr_cache_init_once);
if (nfs4_xattr_cache_cachep == NULL) if (nfs4_xattr_cache_cachep == NULL)
return -ENOMEM; return -ENOMEM;

2
fs/ntfs3/super.c
View File

@ -1825,7 +1825,7 @@ static int __init init_ntfs_fs(void)
ntfs_inode_cachep = kmem_cache_create( ntfs_inode_cachep = kmem_cache_create(
"ntfs_inode_cache", sizeof(struct ntfs_inode), 0, "ntfs_inode_cache", sizeof(struct ntfs_inode), 0,
(SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD | SLAB_ACCOUNT), (SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT),
init_once); init_once);
if (!ntfs_inode_cachep) { if (!ntfs_inode_cachep) {
err = -ENOMEM; err = -ENOMEM;

2
fs/ocfs2/dlmfs/dlmfs.c
View File

@ -578,7 +578,7 @@ static int __init init_dlmfs_fs(void)
dlmfs_inode_cache = kmem_cache_create("dlmfs_inode_cache", dlmfs_inode_cache = kmem_cache_create("dlmfs_inode_cache",
sizeof(struct dlmfs_inode_private), sizeof(struct dlmfs_inode_private),
0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
SLAB_MEM_SPREAD|SLAB_ACCOUNT), SLAB_ACCOUNT),
dlmfs_init_once); dlmfs_init_once);
if (!dlmfs_inode_cache) { if (!dlmfs_inode_cache) {
status = -ENOMEM; status = -ENOMEM;

7
fs/ocfs2/super.c
View File

@ -1706,18 +1706,17 @@ static int ocfs2_initialize_mem_caches(void)
sizeof(struct ocfs2_inode_info), sizeof(struct ocfs2_inode_info),
0, 0,
(SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
SLAB_MEM_SPREAD|SLAB_ACCOUNT), SLAB_ACCOUNT),
ocfs2_inode_init_once); ocfs2_inode_init_once);
ocfs2_dquot_cachep = kmem_cache_create("ocfs2_dquot_cache", ocfs2_dquot_cachep = kmem_cache_create("ocfs2_dquot_cache",
sizeof(struct ocfs2_dquot), sizeof(struct ocfs2_dquot),
0, 0,
(SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT),
SLAB_MEM_SPREAD),
NULL); NULL);
ocfs2_qf_chunk_cachep = kmem_cache_create("ocfs2_qf_chunk_cache", ocfs2_qf_chunk_cachep = kmem_cache_create("ocfs2_qf_chunk_cache",
sizeof(struct ocfs2_quota_chunk), sizeof(struct ocfs2_quota_chunk),
0, 0,
(SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD), (SLAB_RECLAIM_ACCOUNT),
NULL); NULL);
if (!ocfs2_inode_cachep || !ocfs2_dquot_cachep || if (!ocfs2_inode_cachep || !ocfs2_dquot_cachep ||
!ocfs2_qf_chunk_cachep) { !ocfs2_qf_chunk_cachep) {

2
fs/overlayfs/super.c
View File

@ -1503,7 +1503,7 @@ static int __init ovl_init(void)
ovl_inode_cachep = kmem_cache_create("ovl_inode", ovl_inode_cachep = kmem_cache_create("ovl_inode",
sizeof(struct ovl_inode), 0, sizeof(struct ovl_inode), 0,
(SLAB_RECLAIM_ACCOUNT| (SLAB_RECLAIM_ACCOUNT|
SLAB_MEM_SPREAD|SLAB_ACCOUNT), SLAB_ACCOUNT),
ovl_inode_init_once); ovl_inode_init_once);
if (ovl_inode_cachep == NULL) if (ovl_inode_cachep == NULL)
return -ENOMEM; return -ENOMEM;

2
fs/qnx4/inode.c
View File

@ -378,7 +378,7 @@ static int init_inodecache(void)
qnx4_inode_cachep = kmem_cache_create("qnx4_inode_cache", qnx4_inode_cachep = kmem_cache_create("qnx4_inode_cache",
sizeof(struct qnx4_inode_info), sizeof(struct qnx4_inode_info),
0, (SLAB_RECLAIM_ACCOUNT| 0, (SLAB_RECLAIM_ACCOUNT|
SLAB_MEM_SPREAD|SLAB_ACCOUNT), SLAB_ACCOUNT),
init_once); init_once);
if (qnx4_inode_cachep == NULL) if (qnx4_inode_cachep == NULL)
return -ENOMEM; return -ENOMEM;

2
fs/quota/dquot.c
View File

@ -2984,7 +2984,7 @@ static int __init dquot_init(void)
dquot_cachep = kmem_cache_create("dquot", dquot_cachep = kmem_cache_create("dquot",
sizeof(struct dquot), sizeof(unsigned long) * 4, sizeof(struct dquot), sizeof(unsigned long) * 4,
(SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
SLAB_MEM_SPREAD|SLAB_PANIC), SLAB_PANIC),
NULL); NULL);
order = 0; order = 0;

2
fs/smb/client/cifsfs.c
View File

@ -1664,7 +1664,7 @@ cifs_init_inodecache(void)
cifs_inode_cachep = kmem_cache_create("cifs_inode_cache", cifs_inode_cachep = kmem_cache_create("cifs_inode_cache",
sizeof(struct cifsInodeInfo), sizeof(struct cifsInodeInfo),
0, (SLAB_RECLAIM_ACCOUNT| 0, (SLAB_RECLAIM_ACCOUNT|
SLAB_MEM_SPREAD|SLAB_ACCOUNT), SLAB_ACCOUNT),
cifs_init_once); cifs_init_once);
if (cifs_inode_cachep == NULL) if (cifs_inode_cachep == NULL)
return -ENOMEM; return -ENOMEM;

1
fs/tracefs/inode.c
View File

@ -731,7 +731,6 @@ static int __init tracefs_init(void)
tracefs_inode_cachep = kmem_cache_create("tracefs_inode_cache", tracefs_inode_cachep = kmem_cache_create("tracefs_inode_cache",
sizeof(struct tracefs_inode), sizeof(struct tracefs_inode),
0, (SLAB_RECLAIM_ACCOUNT| 0, (SLAB_RECLAIM_ACCOUNT|
SLAB_MEM_SPREAD|
SLAB_ACCOUNT), SLAB_ACCOUNT),
init_once); init_once);
if (!tracefs_inode_cachep) if (!tracefs_inode_cachep)

4
fs/ubifs/super.c
View File

@ -2434,8 +2434,8 @@ static int __init ubifs_init(void)
ubifs_inode_slab = kmem_cache_create("ubifs_inode_slab", ubifs_inode_slab = kmem_cache_create("ubifs_inode_slab",
sizeof(struct ubifs_inode), 0, sizeof(struct ubifs_inode), 0,
SLAB_MEM_SPREAD | SLAB_RECLAIM_ACCOUNT | SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,
SLAB_ACCOUNT, &inode_slab_ctor); &inode_slab_ctor);
if (!ubifs_inode_slab) if (!ubifs_inode_slab)
return -ENOMEM; return -ENOMEM;

1
fs/udf/super.c
View File

@ -177,7 +177,6 @@ static int __init init_inodecache(void)
udf_inode_cachep = kmem_cache_create("udf_inode_cache", udf_inode_cachep = kmem_cache_create("udf_inode_cache",
sizeof(struct udf_inode_info), sizeof(struct udf_inode_info),
0, (SLAB_RECLAIM_ACCOUNT | 0, (SLAB_RECLAIM_ACCOUNT |
SLAB_MEM_SPREAD |
SLAB_ACCOUNT), SLAB_ACCOUNT),
init_once); init_once);
if (!udf_inode_cachep) if (!udf_inode_cachep)

3
fs/ufs/super.c
View File

@ -1470,8 +1470,7 @@ static int __init init_inodecache(void)
{ {
ufs_inode_cachep = kmem_cache_create_usercopy("ufs_inode_cache", ufs_inode_cachep = kmem_cache_create_usercopy("ufs_inode_cache",
sizeof(struct ufs_inode_info), 0, sizeof(struct ufs_inode_info), 0,
(SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD| (SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT),
SLAB_ACCOUNT),
offsetof(struct ufs_inode_info, i_u1.i_symlink), offsetof(struct ufs_inode_info, i_u1.i_symlink),
sizeof_field(struct ufs_inode_info, sizeof_field(struct ufs_inode_info,
i_u1.i_symlink), i_u1.i_symlink),

3
fs/vboxsf/super.c
View File

@ -339,8 +339,7 @@ static int vboxsf_setup(void)
vboxsf_inode_cachep = vboxsf_inode_cachep =
kmem_cache_create("vboxsf_inode_cache", kmem_cache_create("vboxsf_inode_cache",
sizeof(struct vboxsf_inode), 0, sizeof(struct vboxsf_inode), 0,
(SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD | SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,
SLAB_ACCOUNT),
vboxsf_inode_init_once); vboxsf_inode_init_once);
if (!vboxsf_inode_cachep) { if (!vboxsf_inode_cachep) {
err = -ENOMEM; err = -ENOMEM;

7
fs/xfs/xfs_super.c
View File

@ -2043,8 +2043,7 @@ xfs_init_caches(void)
xfs_buf_cache = kmem_cache_create("xfs_buf", sizeof(struct xfs_buf), 0, xfs_buf_cache = kmem_cache_create("xfs_buf", sizeof(struct xfs_buf), 0,
SLAB_HWCACHE_ALIGN | SLAB_HWCACHE_ALIGN |
SLAB_RECLAIM_ACCOUNT | SLAB_RECLAIM_ACCOUNT,
SLAB_MEM_SPREAD,
NULL); NULL);
if (!xfs_buf_cache) if (!xfs_buf_cache)
goto out; goto out;
@ -2109,14 +2108,14 @@ xfs_init_caches(void)
sizeof(struct xfs_inode), 0, sizeof(struct xfs_inode), 0,
(SLAB_HWCACHE_ALIGN | (SLAB_HWCACHE_ALIGN |
SLAB_RECLAIM_ACCOUNT | SLAB_RECLAIM_ACCOUNT |
SLAB_MEM_SPREAD | SLAB_ACCOUNT), SLAB_ACCOUNT),
xfs_fs_inode_init_once); xfs_fs_inode_init_once);
if (!xfs_inode_cache) if (!xfs_inode_cache)
goto out_destroy_efi_cache; goto out_destroy_efi_cache;
xfs_ili_cache = kmem_cache_create("xfs_ili", xfs_ili_cache = kmem_cache_create("xfs_ili",
sizeof(struct xfs_inode_log_item), 0, sizeof(struct xfs_inode_log_item), 0,
SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD, SLAB_RECLAIM_ACCOUNT,
NULL); NULL);
if (!xfs_ili_cache) if (!xfs_ili_cache)
goto out_destroy_inode_cache; goto out_destroy_inode_cache;

2
fs/zonefs/super.c
View File

@ -1422,7 +1422,7 @@ static int __init zonefs_init_inodecache(void)
{ {
zonefs_inode_cachep = kmem_cache_create("zonefs_inode_cache", zonefs_inode_cachep = kmem_cache_create("zonefs_inode_cache",
sizeof(struct zonefs_inode_info), 0, sizeof(struct zonefs_inode_info), 0,
(SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD | SLAB_ACCOUNT), SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,
NULL); NULL);
if (zonefs_inode_cachep == NULL) if (zonefs_inode_cachep == NULL)
return -ENOMEM; return -ENOMEM;

3
include/linux/slab.h
View File

@ -202,9 +202,6 @@ enum _slab_flag_bits {
#endif #endif
#define SLAB_TEMPORARY SLAB_RECLAIM_ACCOUNT /* Objects are short-lived */ #define SLAB_TEMPORARY SLAB_RECLAIM_ACCOUNT /* Objects are short-lived */
/* Obsolete unused flag, to be removed */
#define SLAB_MEM_SPREAD __SLAB_FLAG_UNUSED
/* /*
* ZERO_SIZE_PTR will be returned for zero sized kmalloc requests. * ZERO_SIZE_PTR will be returned for zero sized kmalloc requests.
* *

2
net/sunrpc/rpc_pipe.c
View File

@ -1490,7 +1490,7 @@ int register_rpc_pipefs(void)
rpc_inode_cachep = kmem_cache_create("rpc_inode_cache", rpc_inode_cachep = kmem_cache_create("rpc_inode_cache",
sizeof(struct rpc_inode), sizeof(struct rpc_inode),
0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
SLAB_MEM_SPREAD|SLAB_ACCOUNT), SLAB_ACCOUNT),
init_once); init_once);
if (!rpc_inode_cachep) if (!rpc_inode_cachep)
return -ENOMEM; return -ENOMEM;