History

[PATCH] cpuset memory spread: slab cache format

Rewrap the overly long source code lines resulting from the previous patch's addition of the slab cache flag SLAB_MEM_SPREAD. This patch contains only formatting changes, and no function change.

Paul Jackson committed 20 years ago

Commit fffb60f1 parent 4b6a93130 files · +69 −37Browse files

Unified · Split

30 files
  1. fs/adfs/super.c +2 −1
  2. fs/affs/super.c +2 −1
  3. fs/befs/linuxvfs.c +2 −1
  4. fs/bfs/inode.c +2 −1
  5. fs/block_dev.c +2 −1
  6. fs/cifs/cifsfs.c +2 −1
  7. fs/dquot.c +2 −1
  8. fs/ext2/super.c +2 −1
  9. fs/ext3/super.c +2 −1
  10. fs/fat/inode.c +2 −1
  11. fs/hpfs/super.c +2 −1
  12. fs/isofs/inode.c +2 −1
  13. fs/jffs/inode-v23.c +6 −4
  14. fs/jffs2/super.c +2 −1
  15. fs/jfs/super.c +2 −1
  16. fs/minix/inode.c +2 −1
  17. fs/ncpfs/inode.c +2 −1
  18. fs/nfs/direct.c +2 −1
  19. fs/nfs/inode.c +2 −1
  20. fs/ocfs2/dlm/dlmfs.c +2 −1
  21. fs/ocfs2/super.c +5 −3
  22. fs/proc/inode.c +2 −1
  23. fs/qnx4/inode.c +2 −1
  24. fs/reiserfs/super.c +2 −1
  25. fs/romfs/inode.c +2 −1
  26. fs/smbfs/inode.c +2 −1
  27. fs/udf/super.c +2 −1
  28. fs/ufs/super.c +2 −1
  29. net/socket.c +2 −1
  30. net/sunrpc/rpc_pipe.c +4 −3
fs/adfs/super.c+2−1
@@ -241,7 +241,8 @@ static int init_inodecache(void) · 240 unmodified lines
241241 {
242242 adfs_inode_cachep = kmem_cache_create("adfs_inode_cache",
243243 sizeof(struct adfs_inode_info),
244− 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
244+ 0, (SLAB_RECLAIM_ACCOUNT|
245+ SLAB_MEM_SPREAD),
245246 init_once, NULL);
246247 if (adfs_inode_cachep == NULL)
247248 return -ENOMEM;
fs/affs/super.c+2−1
@@ -98,7 +98,8 @@ static int init_inodecache(void) · 97 unmodified lines
9898 {
9999 affs_inode_cachep = kmem_cache_create("affs_inode_cache",
100100 sizeof(struct affs_inode_info),
101− 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
101+ 0, (SLAB_RECLAIM_ACCOUNT|
102+ SLAB_MEM_SPREAD),
102103 init_once, NULL);
103104 if (affs_inode_cachep == NULL)
104105 return -ENOMEM;
fs/befs/linuxvfs.c+2−1
@@ -427,7 +427,8 @@ befs_init_inodecache(void) · 426 unmodified lines
427427 {
428428 befs_inode_cachep = kmem_cache_create("befs_inode_cache",
429429 sizeof (struct befs_inode_info),
430− 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
430+ 0, (SLAB_RECLAIM_ACCOUNT|
431+ SLAB_MEM_SPREAD),
431432 init_once, NULL);
432433 if (befs_inode_cachep == NULL) {
433434 printk(KERN_ERR "befs_init_inodecache: "
fs/bfs/inode.c+2−1
@@ -257,7 +257,8 @@ static int init_inodecache(void) · 256 unmodified lines
257257 {
258258 bfs_inode_cachep = kmem_cache_create("bfs_inode_cache",
259259 sizeof(struct bfs_inode_info),
260− 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
260+ 0, (SLAB_RECLAIM_ACCOUNT|
261+ SLAB_MEM_SPREAD),
261262 init_once, NULL);
262263 if (bfs_inode_cachep == NULL)
263264 return -ENOMEM;
fs/block_dev.c+2−1
@@ -319,7 +319,8 @@ void __init bdev_cache_init(void) · 318 unmodified lines
319319 {
320320 int err;
321321 bdev_cachep = kmem_cache_create("bdev_cache", sizeof(struct bdev_inode),
322− 0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_PANIC,
322+ 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
323+ SLAB_MEM_SPREAD|SLAB_PANIC),
323324 init_once, NULL);
324325 err = register_filesystem(&bd_type);
325326 if (err)
fs/cifs/cifsfs.c+2−1
@@ -695,7 +695,8 @@ cifs_init_inodecache(void) · 694 unmodified lines
695695 {
696696 cifs_inode_cachep = kmem_cache_create("cifs_inode_cache",
697697 sizeof (struct cifsInodeInfo),
698− 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
698+ 0, (SLAB_RECLAIM_ACCOUNT|
699+ SLAB_MEM_SPREAD),
699700 cifs_init_once, NULL);
700701 if (cifs_inode_cachep == NULL)
701702 return -ENOMEM;
fs/dquot.c+2−1
@@ -1821,7 +1821,8 @@ static int __init dquot_init(void) · 1820 unmodified lines
18211821
18221822 dquot_cachep = kmem_cache_create("dquot",
18231823 sizeof(struct dquot), sizeof(unsigned long) * 4,
1824− SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_PANIC,
1824+ (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
1825+ SLAB_MEM_SPREAD|SLAB_PANIC),
18251826 NULL, NULL);
18261827
18271828 order = 0;
fs/ext2/super.c+2−1
@@ -175,7 +175,8 @@ static int init_inodecache(void) · 174 unmodified lines
175175 {
176176 ext2_inode_cachep = kmem_cache_create("ext2_inode_cache",
177177 sizeof(struct ext2_inode_info),
178− 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
178+ 0, (SLAB_RECLAIM_ACCOUNT|
179+ SLAB_MEM_SPREAD),
179180 init_once, NULL);
180181 if (ext2_inode_cachep == NULL)
181182 return -ENOMEM;
fs/ext3/super.c+2−1
@@ -481,7 +481,8 @@ static int init_inodecache(void) · 480 unmodified lines
481481 {
482482 ext3_inode_cachep = kmem_cache_create("ext3_inode_cache",
483483 sizeof(struct ext3_inode_info),
484− 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
484+ 0, (SLAB_RECLAIM_ACCOUNT|
485+ SLAB_MEM_SPREAD),
485486 init_once, NULL);
486487 if (ext3_inode_cachep == NULL)
487488 return -ENOMEM;
fs/fat/inode.c+2−1
@@ -518,7 +518,8 @@ static int __init fat_init_inodecache(void) · 517 unmodified lines
518518 {
519519 fat_inode_cachep = kmem_cache_create("fat_inode_cache",
520520 sizeof(struct msdos_inode_info),
521− 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
521+ 0, (SLAB_RECLAIM_ACCOUNT|
522+ SLAB_MEM_SPREAD),
522523 init_once, NULL);
523524 if (fat_inode_cachep == NULL)
524525 return -ENOMEM;
fs/hpfs/super.c+2−1
@@ -191,7 +191,8 @@ static int init_inodecache(void) · 190 unmodified lines
191191 {
192192 hpfs_inode_cachep = kmem_cache_create("hpfs_inode_cache",
193193 sizeof(struct hpfs_inode_info),
194− 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
194+ 0, (SLAB_RECLAIM_ACCOUNT|
195+ SLAB_MEM_SPREAD),
195196 init_once, NULL);
196197 if (hpfs_inode_cachep == NULL)
197198 return -ENOMEM;
fs/isofs/inode.c+2−1
@@ -87,7 +87,8 @@ static int init_inodecache(void) · 86 unmodified lines
8787 {
8888 isofs_inode_cachep = kmem_cache_create("isofs_inode_cache",
8989 sizeof(struct iso_inode_info),
90− 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
90+ 0, (SLAB_RECLAIM_ACCOUNT|
91+ SLAB_MEM_SPREAD),
9192 init_once, NULL);
9293 if (isofs_inode_cachep == NULL)
9394 return -ENOMEM;
fs/jffs/inode-v23.c+6−4
@@ -1812,15 +1812,17 @@ init_jffs_fs(void) · 1811 unmodified lines
18121812 }
18131813 #endif
18141814 fm_cache = kmem_cache_create("jffs_fm", sizeof(struct jffs_fm),
1815− 0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
1816− NULL, NULL);
1815+ 0,
1816+ SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
1817+ NULL, NULL);
18171818 if (!fm_cache) {
18181819 return -ENOMEM;
18191820 }
18201821
18211822 node_cache = kmem_cache_create("jffs_node",sizeof(struct jffs_node),
1822− 0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
1823− NULL, NULL);
1823+ 0,
1824+ SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
1825+ NULL, NULL);
18241826 if (!node_cache) {
18251827 kmem_cache_destroy(fm_cache);
18261828 return -ENOMEM;
fs/jffs2/super.c+2−1
@@ -331,7 +331,8 @@ static int __init init_jffs2_fs(void) · 330 unmodified lines
331331
332332 jffs2_inode_cachep = kmem_cache_create("jffs2_i",
333333 sizeof(struct jffs2_inode_info),
334− 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
334+ 0, (SLAB_RECLAIM_ACCOUNT|
335+ SLAB_MEM_SPREAD),
335336 jffs2_i_init_once, NULL);
336337 if (!jffs2_inode_cachep) {
337338 printk(KERN_ERR "JFFS2 error: Failed to initialise inode cache\n");
fs/jfs/super.c+2−1
@@ -664,7 +664,8 @@ static int __init init_jfs_fs(void) · 663 unmodified lines
664664
665665 jfs_inode_cachep =
666666 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
667− SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, init_once, NULL);
667+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
668+ init_once, NULL);
668669 if (jfs_inode_cachep == NULL)
669670 return -ENOMEM;
670671
fs/minix/inode.c+2−1
@@ -80,7 +80,8 @@ static int init_inodecache(void) · 79 unmodified lines
8080 {
8181 minix_inode_cachep = kmem_cache_create("minix_inode_cache",
8282 sizeof(struct minix_inode_info),
83− 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
83+ 0, (SLAB_RECLAIM_ACCOUNT|
84+ SLAB_MEM_SPREAD),
8485 init_once, NULL);
8586 if (minix_inode_cachep == NULL)
8687 return -ENOMEM;
fs/ncpfs/inode.c+2−1
@@ -72,7 +72,8 @@ static int init_inodecache(void) · 71 unmodified lines
7272 {
7373 ncp_inode_cachep = kmem_cache_create("ncp_inode_cache",
7474 sizeof(struct ncp_inode_info),
75− 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
75+ 0, (SLAB_RECLAIM_ACCOUNT|
76+ SLAB_MEM_SPREAD),
7677 init_once, NULL);
7778 if (ncp_inode_cachep == NULL)
7879 return -ENOMEM;
fs/nfs/direct.c+2−1
@@ -781,7 +781,8 @@ int nfs_init_directcache(void) · 780 unmodified lines
781781 {
782782 nfs_direct_cachep = kmem_cache_create("nfs_direct_cache",
783783 sizeof(struct nfs_direct_req),
784− 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
784+ 0, (SLAB_RECLAIM_ACCOUNT|
785+ SLAB_MEM_SPREAD),
785786 NULL, NULL);
786787 if (nfs_direct_cachep == NULL)
787788 return -ENOMEM;
fs/nfs/inode.c+2−1
@@ -2163,7 +2163,8 @@ static int nfs_init_inodecache(void) · 2162 unmodified lines
21632163 {
21642164 nfs_inode_cachep = kmem_cache_create("nfs_inode_cache",
21652165 sizeof(struct nfs_inode),
2166− 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
2166+ 0, (SLAB_RECLAIM_ACCOUNT|
2167+ SLAB_MEM_SPREAD),
21672168 init_once, NULL);
21682169 if (nfs_inode_cachep == NULL)
21692170 return -ENOMEM;
fs/ocfs2/dlm/dlmfs.c+2−1
@@ -596,7 +596,8 @@ static int __init init_dlmfs_fs(void) · 595 unmodified lines
596596
597597 dlmfs_inode_cache = kmem_cache_create("dlmfs_inode_cache",
598598 sizeof(struct dlmfs_inode_private),
599− 0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
599+ 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
600+ SLAB_MEM_SPREAD),
600601 dlmfs_init_once, NULL);
601602 if (!dlmfs_inode_cache)
602603 return -ENOMEM;
fs/ocfs2/super.c+5−3
@@ -950,9 +950,11 @@ static void ocfs2_inode_init_once(void *data, · 949 unmodified lines
950950 static int ocfs2_initialize_mem_caches(void)
951951 {
952952 ocfs2_inode_cachep = kmem_cache_create("ocfs2_inode_cache",
953− sizeof(struct ocfs2_inode_info),
954− 0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
955− ocfs2_inode_init_once, NULL);
953+ sizeof(struct ocfs2_inode_info),
954+ 0,
955+ (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
956+ SLAB_MEM_SPREAD),
957+ ocfs2_inode_init_once, NULL);
956958 if (!ocfs2_inode_cachep)
957959 return -ENOMEM;
958960
fs/proc/inode.c+2−1
@@ -121,7 +121,8 @@ int __init proc_init_inodecache(void) · 120 unmodified lines
121121 {
122122 proc_inode_cachep = kmem_cache_create("proc_inode_cache",
123123 sizeof(struct proc_inode),
124− 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
124+ 0, (SLAB_RECLAIM_ACCOUNT|
125+ SLAB_MEM_SPREAD),
125126 init_once, NULL);
126127 if (proc_inode_cachep == NULL)
127128 return -ENOMEM;
fs/qnx4/inode.c+2−1
@@ -546,7 +546,8 @@ static int init_inodecache(void) · 545 unmodified lines
546546 {
547547 qnx4_inode_cachep = kmem_cache_create("qnx4_inode_cache",
548548 sizeof(struct qnx4_inode_info),
549− 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
549+ 0, (SLAB_RECLAIM_ACCOUNT|
550+ SLAB_MEM_SPREAD),
550551 init_once, NULL);
551552 if (qnx4_inode_cachep == NULL)
552553 return -ENOMEM;
fs/reiserfs/super.c+2−1
@@ -521,7 +521,8 @@ static int init_inodecache(void) · 520 unmodified lines
521521 reiserfs_inode_cachep = kmem_cache_create("reiser_inode_cache",
522522 sizeof(struct
523523 reiserfs_inode_info),
524− 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
524+ 0, (SLAB_RECLAIM_ACCOUNT|
525+ SLAB_MEM_SPREAD),
525526 init_once, NULL);
526527 if (reiserfs_inode_cachep == NULL)
527528 return -ENOMEM;
fs/romfs/inode.c+2−1
@@ -579,7 +579,8 @@ static int init_inodecache(void) · 578 unmodified lines
579579 {
580580 romfs_inode_cachep = kmem_cache_create("romfs_inode_cache",
581581 sizeof(struct romfs_inode_info),
582− 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
582+ 0, (SLAB_RECLAIM_ACCOUNT|
583+ SLAB_MEM_SPREAD),
583584 init_once, NULL);
584585 if (romfs_inode_cachep == NULL)
585586 return -ENOMEM;
fs/smbfs/inode.c+2−1
@@ -80,7 +80,8 @@ static int init_inodecache(void) · 79 unmodified lines
8080 {
8181 smb_inode_cachep = kmem_cache_create("smb_inode_cache",
8282 sizeof(struct smb_inode_info),
83− 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
83+ 0, (SLAB_RECLAIM_ACCOUNT|
84+ SLAB_MEM_SPREAD),
8485 init_once, NULL);
8586 if (smb_inode_cachep == NULL)
8687 return -ENOMEM;
fs/udf/super.c+2−1
@@ -140,7 +140,8 @@ static int init_inodecache(void) · 139 unmodified lines
140140 {
141141 udf_inode_cachep = kmem_cache_create("udf_inode_cache",
142142 sizeof(struct udf_inode_info),
143− 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
143+ 0, (SLAB_RECLAIM_ACCOUNT|
144+ SLAB_MEM_SPREAD),
144145 init_once, NULL);
145146 if (udf_inode_cachep == NULL)
146147 return -ENOMEM;
fs/ufs/super.c+2−1
@@ -1184,7 +1184,8 @@ static int init_inodecache(void) · 1183 unmodified lines
11841184 {
11851185 ufs_inode_cachep = kmem_cache_create("ufs_inode_cache",
11861186 sizeof(struct ufs_inode_info),
1187− 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
1187+ 0, (SLAB_RECLAIM_ACCOUNT|
1188+ SLAB_MEM_SPREAD),
11881189 init_once, NULL);
11891190 if (ufs_inode_cachep == NULL)
11901191 return -ENOMEM;
net/socket.c+2−1
@@ -319,7 +319,8 @@ static int init_inodecache(void) · 318 unmodified lines
319319 {
320320 sock_inode_cachep = kmem_cache_create("sock_inode_cache",
321321 sizeof(struct socket_alloc),
322− 0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
322+ 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
323+ SLAB_MEM_SPREAD),
323324 init_once, NULL);
324325 if (sock_inode_cachep == NULL)
325326 return -ENOMEM;
net/sunrpc/rpc_pipe.c+4−3
@@ -849,9 +849,10 @@ init_once(void * foo, kmem_cache_t * cachep, unsigned long flags) · 848 unmodified lines
849849 int register_rpc_pipefs(void)
850850 {
851851 rpc_inode_cachep = kmem_cache_create("rpc_inode_cache",
852− sizeof(struct rpc_inode),
853− 0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
854− init_once, NULL);
852+ sizeof(struct rpc_inode),
853+ 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
854+ SLAB_MEM_SPREAD),
855+ init_once, NULL);
855856 if (!rpc_inode_cachep)
856857 return -ENOMEM;
857858 register_filesystem(&rpc_pipe_fs_type);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t