Skip to content

Commit f88c3fb

Browse files
committed
mm, slab: remove last vestiges of SLAB_MEM_SPREAD
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 <[email protected]>
1 parent 0ea680e commit f88c3fb

File tree

39 files changed

+51
-68
lines changed

39 files changed

+51
-68
lines changed

drivers/dax/super.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,8 +532,7 @@ static int dax_fs_init(void)
532532
int rc;
533533

534534
dax_cache = kmem_cache_create("dax_cache", sizeof(struct dax_device), 0,
535-
(SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
536-
SLAB_MEM_SPREAD|SLAB_ACCOUNT),
535+
SLAB_HWCACHE_ALIGN | SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,
537536
init_once);
538537
if (!dax_cache)
539538
return -ENOMEM;

drivers/usb/isp1760/isp1760-hcd.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2521,21 +2521,19 @@ static const struct hc_driver isp1760_hc_driver = {
25212521
int __init isp1760_init_kmem_once(void)
25222522
{
25232523
urb_listitem_cachep = kmem_cache_create("isp1760_urb_listitem",
2524-
sizeof(struct urb_listitem), 0, SLAB_TEMPORARY |
2525-
SLAB_MEM_SPREAD, NULL);
2524+
sizeof(struct urb_listitem), 0, SLAB_TEMPORARY, NULL);
25262525

25272526
if (!urb_listitem_cachep)
25282527
return -ENOMEM;
25292528

25302529
qtd_cachep = kmem_cache_create("isp1760_qtd",
2531-
sizeof(struct isp1760_qtd), 0, SLAB_TEMPORARY |
2532-
SLAB_MEM_SPREAD, NULL);
2530+
sizeof(struct isp1760_qtd), 0, SLAB_TEMPORARY, NULL);
25332531

25342532
if (!qtd_cachep)
25352533
goto destroy_urb_listitem;
25362534

25372535
qh_cachep = kmem_cache_create("isp1760_qh", sizeof(struct isp1760_qh),
2538-
0, SLAB_TEMPORARY | SLAB_MEM_SPREAD, NULL);
2536+
0, SLAB_TEMPORARY, NULL);
25392537

25402538
if (!qh_cachep)
25412539
goto destroy_qtd;

fs/9p/v9fs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ static int v9fs_init_inode_cache(void)
637637
v9fs_inode_cache = kmem_cache_create("v9fs_inode_cache",
638638
sizeof(struct v9fs_inode),
639639
0, (SLAB_RECLAIM_ACCOUNT|
640-
SLAB_MEM_SPREAD|SLAB_ACCOUNT),
640+
SLAB_ACCOUNT),
641641
v9fs_inode_init_once);
642642
if (!v9fs_inode_cache)
643643
return -ENOMEM;

fs/adfs/super.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ static int __init init_inodecache(void)
249249
adfs_inode_cachep = kmem_cache_create("adfs_inode_cache",
250250
sizeof(struct adfs_inode_info),
251251
0, (SLAB_RECLAIM_ACCOUNT|
252-
SLAB_MEM_SPREAD|SLAB_ACCOUNT),
252+
SLAB_ACCOUNT),
253253
init_once);
254254
if (adfs_inode_cachep == NULL)
255255
return -ENOMEM;

fs/befs/linuxvfs.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,7 @@ befs_init_inodecache(void)
435435
{
436436
befs_inode_cachep = kmem_cache_create_usercopy("befs_inode_cache",
437437
sizeof(struct befs_inode_info), 0,
438-
(SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|
439-
SLAB_ACCOUNT),
438+
SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,
440439
offsetof(struct befs_inode_info,
441440
i_data.symlink),
442441
sizeof_field(struct befs_inode_info,

fs/bfs/inode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ static int __init init_inodecache(void)
259259
bfs_inode_cachep = kmem_cache_create("bfs_inode_cache",
260260
sizeof(struct bfs_inode_info),
261261
0, (SLAB_RECLAIM_ACCOUNT|
262-
SLAB_MEM_SPREAD|SLAB_ACCOUNT),
262+
SLAB_ACCOUNT),
263263
init_once);
264264
if (bfs_inode_cachep == NULL)
265265
return -ENOMEM;

fs/ceph/super.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -928,36 +928,36 @@ static int __init init_caches(void)
928928
ceph_inode_cachep = kmem_cache_create("ceph_inode_info",
929929
sizeof(struct ceph_inode_info),
930930
__alignof__(struct ceph_inode_info),
931-
SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|
932-
SLAB_ACCOUNT, ceph_inode_init_once);
931+
SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,
932+
ceph_inode_init_once);
933933
if (!ceph_inode_cachep)
934934
return -ENOMEM;
935935

936-
ceph_cap_cachep = KMEM_CACHE(ceph_cap, SLAB_MEM_SPREAD);
936+
ceph_cap_cachep = KMEM_CACHE(ceph_cap, 0);
937937
if (!ceph_cap_cachep)
938938
goto bad_cap;
939-
ceph_cap_snap_cachep = KMEM_CACHE(ceph_cap_snap, SLAB_MEM_SPREAD);
939+
ceph_cap_snap_cachep = KMEM_CACHE(ceph_cap_snap, 0);
940940
if (!ceph_cap_snap_cachep)
941941
goto bad_cap_snap;
942942
ceph_cap_flush_cachep = KMEM_CACHE(ceph_cap_flush,
943-
SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD);
943+
SLAB_RECLAIM_ACCOUNT);
944944
if (!ceph_cap_flush_cachep)
945945
goto bad_cap_flush;
946946

947947
ceph_dentry_cachep = KMEM_CACHE(ceph_dentry_info,
948-
SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD);
948+
SLAB_RECLAIM_ACCOUNT);
949949
if (!ceph_dentry_cachep)
950950
goto bad_dentry;
951951

952-
ceph_file_cachep = KMEM_CACHE(ceph_file_info, SLAB_MEM_SPREAD);
952+
ceph_file_cachep = KMEM_CACHE(ceph_file_info, 0);
953953
if (!ceph_file_cachep)
954954
goto bad_file;
955955

956-
ceph_dir_file_cachep = KMEM_CACHE(ceph_dir_file_info, SLAB_MEM_SPREAD);
956+
ceph_dir_file_cachep = KMEM_CACHE(ceph_dir_file_info, 0);
957957
if (!ceph_dir_file_cachep)
958958
goto bad_dir_file;
959959

960-
ceph_mds_request_cachep = KMEM_CACHE(ceph_mds_request, SLAB_MEM_SPREAD);
960+
ceph_mds_request_cachep = KMEM_CACHE(ceph_mds_request, 0);
961961
if (!ceph_mds_request_cachep)
962962
goto bad_mds_req;
963963

fs/coda/inode.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ int __init coda_init_inodecache(void)
7272
{
7373
coda_inode_cachep = kmem_cache_create("coda_inode_cache",
7474
sizeof(struct coda_inode_info), 0,
75-
SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|
76-
SLAB_ACCOUNT, init_once);
75+
SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,
76+
init_once);
7777
if (coda_inode_cachep == NULL)
7878
return -ENOMEM;
7979
return 0;

fs/erofs/super.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -857,7 +857,7 @@ static int __init erofs_module_init(void)
857857

858858
erofs_inode_cachep = kmem_cache_create("erofs_inode",
859859
sizeof(struct erofs_inode), 0,
860-
SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD | SLAB_ACCOUNT,
860+
SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT,
861861
erofs_inode_init_once);
862862
if (!erofs_inode_cachep)
863863
return -ENOMEM;

fs/exfat/cache.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ int exfat_cache_init(void)
4646
{
4747
exfat_cachep = kmem_cache_create("exfat_cache",
4848
sizeof(struct exfat_cache),
49-
0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
49+
0, SLAB_RECLAIM_ACCOUNT,
5050
exfat_cache_init_once);
5151
if (!exfat_cachep)
5252
return -ENOMEM;

0 commit comments

Comments
 (0)