diff options
author | Paul Jackson <pj@sgi.com> | 2006-03-24 06:16:06 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-24 10:33:23 -0500 |
commit | fffb60f93ce5880aade88e01d7133b52a4879710 (patch) | |
tree | 7882f0550af8580c0646306f6d391fe610f7ef8c | |
parent | 4b6a9316fab51af611dc8671f296734089f6a22a (diff) |
[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.
Signed-off-by: Paul Jackson <pj@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | fs/adfs/super.c | 3 | ||||
-rw-r--r-- | fs/affs/super.c | 3 | ||||
-rw-r--r-- | fs/befs/linuxvfs.c | 3 | ||||
-rw-r--r-- | fs/bfs/inode.c | 3 | ||||
-rw-r--r-- | fs/block_dev.c | 3 | ||||
-rw-r--r-- | fs/cifs/cifsfs.c | 3 | ||||
-rw-r--r-- | fs/dquot.c | 3 | ||||
-rw-r--r-- | fs/ext2/super.c | 3 | ||||
-rw-r--r-- | fs/ext3/super.c | 3 | ||||
-rw-r--r-- | fs/fat/inode.c | 3 | ||||
-rw-r--r-- | fs/hpfs/super.c | 3 | ||||
-rw-r--r-- | fs/isofs/inode.c | 3 | ||||
-rw-r--r-- | fs/jffs/inode-v23.c | 10 | ||||
-rw-r--r-- | fs/jffs2/super.c | 3 | ||||
-rw-r--r-- | fs/jfs/super.c | 3 | ||||
-rw-r--r-- | fs/minix/inode.c | 3 | ||||
-rw-r--r-- | fs/ncpfs/inode.c | 3 | ||||
-rw-r--r-- | fs/nfs/direct.c | 3 | ||||
-rw-r--r-- | fs/nfs/inode.c | 3 | ||||
-rw-r--r-- | fs/ocfs2/dlm/dlmfs.c | 3 | ||||
-rw-r--r-- | fs/ocfs2/super.c | 8 | ||||
-rw-r--r-- | fs/proc/inode.c | 3 | ||||
-rw-r--r-- | fs/qnx4/inode.c | 3 | ||||
-rw-r--r-- | fs/reiserfs/super.c | 3 | ||||
-rw-r--r-- | fs/romfs/inode.c | 3 | ||||
-rw-r--r-- | fs/smbfs/inode.c | 3 | ||||
-rw-r--r-- | fs/udf/super.c | 3 | ||||
-rw-r--r-- | fs/ufs/super.c | 3 | ||||
-rw-r--r-- | net/socket.c | 3 | ||||
-rw-r--r-- | net/sunrpc/rpc_pipe.c | 7 |
30 files changed, 69 insertions, 37 deletions
diff --git a/fs/adfs/super.c b/fs/adfs/super.c index 80f798b7d760..252abda0d200 100644 --- a/fs/adfs/super.c +++ b/fs/adfs/super.c | |||
@@ -241,7 +241,8 @@ static int init_inodecache(void) | |||
241 | { | 241 | { |
242 | adfs_inode_cachep = kmem_cache_create("adfs_inode_cache", | 242 | adfs_inode_cachep = kmem_cache_create("adfs_inode_cache", |
243 | sizeof(struct adfs_inode_info), | 243 | sizeof(struct adfs_inode_info), |
244 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 244 | 0, (SLAB_RECLAIM_ACCOUNT| |
245 | SLAB_MEM_SPREAD), | ||
245 | init_once, NULL); | 246 | init_once, NULL); |
246 | if (adfs_inode_cachep == NULL) | 247 | if (adfs_inode_cachep == NULL) |
247 | return -ENOMEM; | 248 | return -ENOMEM; |
diff --git a/fs/affs/super.c b/fs/affs/super.c index 216536d77a5f..4d7e5b19e5cd 100644 --- a/fs/affs/super.c +++ b/fs/affs/super.c | |||
@@ -98,7 +98,8 @@ static int init_inodecache(void) | |||
98 | { | 98 | { |
99 | affs_inode_cachep = kmem_cache_create("affs_inode_cache", | 99 | affs_inode_cachep = kmem_cache_create("affs_inode_cache", |
100 | sizeof(struct affs_inode_info), | 100 | sizeof(struct affs_inode_info), |
101 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 101 | 0, (SLAB_RECLAIM_ACCOUNT| |
102 | SLAB_MEM_SPREAD), | ||
102 | init_once, NULL); | 103 | init_once, NULL); |
103 | if (affs_inode_cachep == NULL) | 104 | if (affs_inode_cachep == NULL) |
104 | return -ENOMEM; | 105 | return -ENOMEM; |
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c index ac031686d6d7..044a59587829 100644 --- a/fs/befs/linuxvfs.c +++ b/fs/befs/linuxvfs.c | |||
@@ -427,7 +427,8 @@ befs_init_inodecache(void) | |||
427 | { | 427 | { |
428 | befs_inode_cachep = kmem_cache_create("befs_inode_cache", | 428 | befs_inode_cachep = kmem_cache_create("befs_inode_cache", |
429 | sizeof (struct befs_inode_info), | 429 | sizeof (struct befs_inode_info), |
430 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 430 | 0, (SLAB_RECLAIM_ACCOUNT| |
431 | SLAB_MEM_SPREAD), | ||
431 | init_once, NULL); | 432 | init_once, NULL); |
432 | if (befs_inode_cachep == NULL) { | 433 | if (befs_inode_cachep == NULL) { |
433 | printk(KERN_ERR "befs_init_inodecache: " | 434 | printk(KERN_ERR "befs_init_inodecache: " |
diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c index 584a0838ac61..55a7a78332f8 100644 --- a/fs/bfs/inode.c +++ b/fs/bfs/inode.c | |||
@@ -257,7 +257,8 @@ static int init_inodecache(void) | |||
257 | { | 257 | { |
258 | bfs_inode_cachep = kmem_cache_create("bfs_inode_cache", | 258 | bfs_inode_cachep = kmem_cache_create("bfs_inode_cache", |
259 | sizeof(struct bfs_inode_info), | 259 | sizeof(struct bfs_inode_info), |
260 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 260 | 0, (SLAB_RECLAIM_ACCOUNT| |
261 | SLAB_MEM_SPREAD), | ||
261 | init_once, NULL); | 262 | init_once, NULL); |
262 | if (bfs_inode_cachep == NULL) | 263 | if (bfs_inode_cachep == NULL) |
263 | return -ENOMEM; | 264 | return -ENOMEM; |
diff --git a/fs/block_dev.c b/fs/block_dev.c index 80f97729e57f..2d096057ab53 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c | |||
@@ -319,7 +319,8 @@ void __init bdev_cache_init(void) | |||
319 | { | 319 | { |
320 | int err; | 320 | int err; |
321 | bdev_cachep = kmem_cache_create("bdev_cache", sizeof(struct bdev_inode), | 321 | 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), | ||
323 | init_once, NULL); | 324 | init_once, NULL); |
324 | err = register_filesystem(&bd_type); | 325 | err = register_filesystem(&bd_type); |
325 | if (err) | 326 | if (err) |
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index ba5a24b99a11..221b3334b737 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
@@ -695,7 +695,8 @@ cifs_init_inodecache(void) | |||
695 | { | 695 | { |
696 | cifs_inode_cachep = kmem_cache_create("cifs_inode_cache", | 696 | cifs_inode_cachep = kmem_cache_create("cifs_inode_cache", |
697 | sizeof (struct cifsInodeInfo), | 697 | sizeof (struct cifsInodeInfo), |
698 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 698 | 0, (SLAB_RECLAIM_ACCOUNT| |
699 | SLAB_MEM_SPREAD), | ||
699 | cifs_init_once, NULL); | 700 | cifs_init_once, NULL); |
700 | if (cifs_inode_cachep == NULL) | 701 | if (cifs_inode_cachep == NULL) |
701 | return -ENOMEM; | 702 | return -ENOMEM; |
diff --git a/fs/dquot.c b/fs/dquot.c index 1405755b8e4d..6b3886920939 100644 --- a/fs/dquot.c +++ b/fs/dquot.c | |||
@@ -1821,7 +1821,8 @@ static int __init dquot_init(void) | |||
1821 | 1821 | ||
1822 | dquot_cachep = kmem_cache_create("dquot", | 1822 | dquot_cachep = kmem_cache_create("dquot", |
1823 | sizeof(struct dquot), sizeof(unsigned long) * 4, | 1823 | 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), | ||
1825 | NULL, NULL); | 1826 | NULL, NULL); |
1826 | 1827 | ||
1827 | order = 0; | 1828 | order = 0; |
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index e153f0cc240b..268b73f5847c 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c | |||
@@ -175,7 +175,8 @@ static int init_inodecache(void) | |||
175 | { | 175 | { |
176 | ext2_inode_cachep = kmem_cache_create("ext2_inode_cache", | 176 | ext2_inode_cachep = kmem_cache_create("ext2_inode_cache", |
177 | sizeof(struct ext2_inode_info), | 177 | sizeof(struct ext2_inode_info), |
178 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 178 | 0, (SLAB_RECLAIM_ACCOUNT| |
179 | SLAB_MEM_SPREAD), | ||
179 | init_once, NULL); | 180 | init_once, NULL); |
180 | if (ext2_inode_cachep == NULL) | 181 | if (ext2_inode_cachep == NULL) |
181 | return -ENOMEM; | 182 | return -ENOMEM; |
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index e4a0a7cbb5b2..a3e2a8e7dca2 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c | |||
@@ -481,7 +481,8 @@ static int init_inodecache(void) | |||
481 | { | 481 | { |
482 | ext3_inode_cachep = kmem_cache_create("ext3_inode_cache", | 482 | ext3_inode_cachep = kmem_cache_create("ext3_inode_cache", |
483 | sizeof(struct ext3_inode_info), | 483 | sizeof(struct ext3_inode_info), |
484 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 484 | 0, (SLAB_RECLAIM_ACCOUNT| |
485 | SLAB_MEM_SPREAD), | ||
485 | init_once, NULL); | 486 | init_once, NULL); |
486 | if (ext3_inode_cachep == NULL) | 487 | if (ext3_inode_cachep == NULL) |
487 | return -ENOMEM; | 488 | return -ENOMEM; |
diff --git a/fs/fat/inode.c b/fs/fat/inode.c index a75708901e73..297300fe81c2 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c | |||
@@ -518,7 +518,8 @@ static int __init fat_init_inodecache(void) | |||
518 | { | 518 | { |
519 | fat_inode_cachep = kmem_cache_create("fat_inode_cache", | 519 | fat_inode_cachep = kmem_cache_create("fat_inode_cache", |
520 | sizeof(struct msdos_inode_info), | 520 | sizeof(struct msdos_inode_info), |
521 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 521 | 0, (SLAB_RECLAIM_ACCOUNT| |
522 | SLAB_MEM_SPREAD), | ||
522 | init_once, NULL); | 523 | init_once, NULL); |
523 | if (fat_inode_cachep == NULL) | 524 | if (fat_inode_cachep == NULL) |
524 | return -ENOMEM; | 525 | return -ENOMEM; |
diff --git a/fs/hpfs/super.c b/fs/hpfs/super.c index 25fbefe4ed00..d72d8c87c996 100644 --- a/fs/hpfs/super.c +++ b/fs/hpfs/super.c | |||
@@ -191,7 +191,8 @@ static int init_inodecache(void) | |||
191 | { | 191 | { |
192 | hpfs_inode_cachep = kmem_cache_create("hpfs_inode_cache", | 192 | hpfs_inode_cachep = kmem_cache_create("hpfs_inode_cache", |
193 | sizeof(struct hpfs_inode_info), | 193 | sizeof(struct hpfs_inode_info), |
194 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 194 | 0, (SLAB_RECLAIM_ACCOUNT| |
195 | SLAB_MEM_SPREAD), | ||
195 | init_once, NULL); | 196 | init_once, NULL); |
196 | if (hpfs_inode_cachep == NULL) | 197 | if (hpfs_inode_cachep == NULL) |
197 | return -ENOMEM; | 198 | return -ENOMEM; |
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index fcb68151ad86..70adbb98bad1 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c | |||
@@ -87,7 +87,8 @@ static int init_inodecache(void) | |||
87 | { | 87 | { |
88 | isofs_inode_cachep = kmem_cache_create("isofs_inode_cache", | 88 | isofs_inode_cachep = kmem_cache_create("isofs_inode_cache", |
89 | sizeof(struct iso_inode_info), | 89 | sizeof(struct iso_inode_info), |
90 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 90 | 0, (SLAB_RECLAIM_ACCOUNT| |
91 | SLAB_MEM_SPREAD), | ||
91 | init_once, NULL); | 92 | init_once, NULL); |
92 | if (isofs_inode_cachep == NULL) | 93 | if (isofs_inode_cachep == NULL) |
93 | return -ENOMEM; | 94 | return -ENOMEM; |
diff --git a/fs/jffs/inode-v23.c b/fs/jffs/inode-v23.c index ffa49861d985..5a4519e834da 100644 --- a/fs/jffs/inode-v23.c +++ b/fs/jffs/inode-v23.c | |||
@@ -1812,15 +1812,17 @@ init_jffs_fs(void) | |||
1812 | } | 1812 | } |
1813 | #endif | 1813 | #endif |
1814 | fm_cache = kmem_cache_create("jffs_fm", sizeof(struct jffs_fm), | 1814 | fm_cache = kmem_cache_create("jffs_fm", sizeof(struct jffs_fm), |
1815 | 0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 1815 | 0, |
1816 | NULL, NULL); | 1816 | SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, |
1817 | NULL, NULL); | ||
1817 | if (!fm_cache) { | 1818 | if (!fm_cache) { |
1818 | return -ENOMEM; | 1819 | return -ENOMEM; |
1819 | } | 1820 | } |
1820 | 1821 | ||
1821 | node_cache = kmem_cache_create("jffs_node",sizeof(struct jffs_node), | 1822 | node_cache = kmem_cache_create("jffs_node",sizeof(struct jffs_node), |
1822 | 0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 1823 | 0, |
1823 | NULL, NULL); | 1824 | SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, |
1825 | NULL, NULL); | ||
1824 | if (!node_cache) { | 1826 | if (!node_cache) { |
1825 | kmem_cache_destroy(fm_cache); | 1827 | kmem_cache_destroy(fm_cache); |
1826 | return -ENOMEM; | 1828 | return -ENOMEM; |
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c index f2563389581c..ffd8e84b22cc 100644 --- a/fs/jffs2/super.c +++ b/fs/jffs2/super.c | |||
@@ -331,7 +331,8 @@ static int __init init_jffs2_fs(void) | |||
331 | 331 | ||
332 | jffs2_inode_cachep = kmem_cache_create("jffs2_i", | 332 | jffs2_inode_cachep = kmem_cache_create("jffs2_i", |
333 | sizeof(struct jffs2_inode_info), | 333 | sizeof(struct jffs2_inode_info), |
334 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 334 | 0, (SLAB_RECLAIM_ACCOUNT| |
335 | SLAB_MEM_SPREAD), | ||
335 | jffs2_i_init_once, NULL); | 336 | jffs2_i_init_once, NULL); |
336 | if (!jffs2_inode_cachep) { | 337 | if (!jffs2_inode_cachep) { |
337 | printk(KERN_ERR "JFFS2 error: Failed to initialise inode cache\n"); | 338 | printk(KERN_ERR "JFFS2 error: Failed to initialise inode cache\n"); |
diff --git a/fs/jfs/super.c b/fs/jfs/super.c index 4ac40bfdbd84..db6f41d6dd60 100644 --- a/fs/jfs/super.c +++ b/fs/jfs/super.c | |||
@@ -664,7 +664,8 @@ static int __init init_jfs_fs(void) | |||
664 | 664 | ||
665 | jfs_inode_cachep = | 665 | jfs_inode_cachep = |
666 | kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0, | 666 | 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); | ||
668 | if (jfs_inode_cachep == NULL) | 669 | if (jfs_inode_cachep == NULL) |
669 | return -ENOMEM; | 670 | return -ENOMEM; |
670 | 671 | ||
diff --git a/fs/minix/inode.c b/fs/minix/inode.c index 4fabef0b6519..d9ffc43fee59 100644 --- a/fs/minix/inode.c +++ b/fs/minix/inode.c | |||
@@ -80,7 +80,8 @@ static int init_inodecache(void) | |||
80 | { | 80 | { |
81 | minix_inode_cachep = kmem_cache_create("minix_inode_cache", | 81 | minix_inode_cachep = kmem_cache_create("minix_inode_cache", |
82 | sizeof(struct minix_inode_info), | 82 | sizeof(struct minix_inode_info), |
83 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 83 | 0, (SLAB_RECLAIM_ACCOUNT| |
84 | SLAB_MEM_SPREAD), | ||
84 | init_once, NULL); | 85 | init_once, NULL); |
85 | if (minix_inode_cachep == NULL) | 86 | if (minix_inode_cachep == NULL) |
86 | return -ENOMEM; | 87 | return -ENOMEM; |
diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c index 2547ebaa6547..a1f3e972c6ef 100644 --- a/fs/ncpfs/inode.c +++ b/fs/ncpfs/inode.c | |||
@@ -72,7 +72,8 @@ static int init_inodecache(void) | |||
72 | { | 72 | { |
73 | ncp_inode_cachep = kmem_cache_create("ncp_inode_cache", | 73 | ncp_inode_cachep = kmem_cache_create("ncp_inode_cache", |
74 | sizeof(struct ncp_inode_info), | 74 | sizeof(struct ncp_inode_info), |
75 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 75 | 0, (SLAB_RECLAIM_ACCOUNT| |
76 | SLAB_MEM_SPREAD), | ||
76 | init_once, NULL); | 77 | init_once, NULL); |
77 | if (ncp_inode_cachep == NULL) | 78 | if (ncp_inode_cachep == NULL) |
78 | return -ENOMEM; | 79 | return -ENOMEM; |
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 751f5b5e7e07..4ae2f3b33fef 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c | |||
@@ -781,7 +781,8 @@ int nfs_init_directcache(void) | |||
781 | { | 781 | { |
782 | nfs_direct_cachep = kmem_cache_create("nfs_direct_cache", | 782 | nfs_direct_cachep = kmem_cache_create("nfs_direct_cache", |
783 | sizeof(struct nfs_direct_req), | 783 | sizeof(struct nfs_direct_req), |
784 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 784 | 0, (SLAB_RECLAIM_ACCOUNT| |
785 | SLAB_MEM_SPREAD), | ||
785 | NULL, NULL); | 786 | NULL, NULL); |
786 | if (nfs_direct_cachep == NULL) | 787 | if (nfs_direct_cachep == NULL) |
787 | return -ENOMEM; | 788 | return -ENOMEM; |
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 834c1e905ce1..3413996f9a86 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
@@ -2163,7 +2163,8 @@ static int nfs_init_inodecache(void) | |||
2163 | { | 2163 | { |
2164 | nfs_inode_cachep = kmem_cache_create("nfs_inode_cache", | 2164 | nfs_inode_cachep = kmem_cache_create("nfs_inode_cache", |
2165 | sizeof(struct nfs_inode), | 2165 | sizeof(struct nfs_inode), |
2166 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 2166 | 0, (SLAB_RECLAIM_ACCOUNT| |
2167 | SLAB_MEM_SPREAD), | ||
2167 | init_once, NULL); | 2168 | init_once, NULL); |
2168 | if (nfs_inode_cachep == NULL) | 2169 | if (nfs_inode_cachep == NULL) |
2169 | return -ENOMEM; | 2170 | return -ENOMEM; |
diff --git a/fs/ocfs2/dlm/dlmfs.c b/fs/ocfs2/dlm/dlmfs.c index ca8587cc58bc..7e88e24b3471 100644 --- a/fs/ocfs2/dlm/dlmfs.c +++ b/fs/ocfs2/dlm/dlmfs.c | |||
@@ -596,7 +596,8 @@ static int __init init_dlmfs_fs(void) | |||
596 | 596 | ||
597 | dlmfs_inode_cache = kmem_cache_create("dlmfs_inode_cache", | 597 | dlmfs_inode_cache = kmem_cache_create("dlmfs_inode_cache", |
598 | sizeof(struct dlmfs_inode_private), | 598 | 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), | ||
600 | dlmfs_init_once, NULL); | 601 | dlmfs_init_once, NULL); |
601 | if (!dlmfs_inode_cache) | 602 | if (!dlmfs_inode_cache) |
602 | return -ENOMEM; | 603 | return -ENOMEM; |
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 3fe7896c666a..44d8b5248236 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c | |||
@@ -950,9 +950,11 @@ static void ocfs2_inode_init_once(void *data, | |||
950 | static int ocfs2_initialize_mem_caches(void) | 950 | static int ocfs2_initialize_mem_caches(void) |
951 | { | 951 | { |
952 | ocfs2_inode_cachep = kmem_cache_create("ocfs2_inode_cache", | 952 | ocfs2_inode_cachep = kmem_cache_create("ocfs2_inode_cache", |
953 | sizeof(struct ocfs2_inode_info), | 953 | sizeof(struct ocfs2_inode_info), |
954 | 0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 954 | 0, |
955 | ocfs2_inode_init_once, NULL); | 955 | (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| |
956 | SLAB_MEM_SPREAD), | ||
957 | ocfs2_inode_init_once, NULL); | ||
956 | if (!ocfs2_inode_cachep) | 958 | if (!ocfs2_inode_cachep) |
957 | return -ENOMEM; | 959 | return -ENOMEM; |
958 | 960 | ||
diff --git a/fs/proc/inode.c b/fs/proc/inode.c index 5ac781801ae7..722b9c463111 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c | |||
@@ -121,7 +121,8 @@ int __init proc_init_inodecache(void) | |||
121 | { | 121 | { |
122 | proc_inode_cachep = kmem_cache_create("proc_inode_cache", | 122 | proc_inode_cachep = kmem_cache_create("proc_inode_cache", |
123 | sizeof(struct proc_inode), | 123 | sizeof(struct proc_inode), |
124 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 124 | 0, (SLAB_RECLAIM_ACCOUNT| |
125 | SLAB_MEM_SPREAD), | ||
125 | init_once, NULL); | 126 | init_once, NULL); |
126 | if (proc_inode_cachep == NULL) | 127 | if (proc_inode_cachep == NULL) |
127 | return -ENOMEM; | 128 | return -ENOMEM; |
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c index 463142c80ae8..2ecd46f85e9f 100644 --- a/fs/qnx4/inode.c +++ b/fs/qnx4/inode.c | |||
@@ -546,7 +546,8 @@ static int init_inodecache(void) | |||
546 | { | 546 | { |
547 | qnx4_inode_cachep = kmem_cache_create("qnx4_inode_cache", | 547 | qnx4_inode_cachep = kmem_cache_create("qnx4_inode_cache", |
548 | sizeof(struct qnx4_inode_info), | 548 | sizeof(struct qnx4_inode_info), |
549 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 549 | 0, (SLAB_RECLAIM_ACCOUNT| |
550 | SLAB_MEM_SPREAD), | ||
550 | init_once, NULL); | 551 | init_once, NULL); |
551 | if (qnx4_inode_cachep == NULL) | 552 | if (qnx4_inode_cachep == NULL) |
552 | return -ENOMEM; | 553 | return -ENOMEM; |
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index bf4346057879..93e6ef9360e3 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c | |||
@@ -521,7 +521,8 @@ static int init_inodecache(void) | |||
521 | reiserfs_inode_cachep = kmem_cache_create("reiser_inode_cache", | 521 | reiserfs_inode_cachep = kmem_cache_create("reiser_inode_cache", |
522 | sizeof(struct | 522 | sizeof(struct |
523 | reiserfs_inode_info), | 523 | reiserfs_inode_info), |
524 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 524 | 0, (SLAB_RECLAIM_ACCOUNT| |
525 | SLAB_MEM_SPREAD), | ||
525 | init_once, NULL); | 526 | init_once, NULL); |
526 | if (reiserfs_inode_cachep == NULL) | 527 | if (reiserfs_inode_cachep == NULL) |
527 | return -ENOMEM; | 528 | return -ENOMEM; |
diff --git a/fs/romfs/inode.c b/fs/romfs/inode.c index 223bebb8b45e..c2fc424d7d5c 100644 --- a/fs/romfs/inode.c +++ b/fs/romfs/inode.c | |||
@@ -579,7 +579,8 @@ static int init_inodecache(void) | |||
579 | { | 579 | { |
580 | romfs_inode_cachep = kmem_cache_create("romfs_inode_cache", | 580 | romfs_inode_cachep = kmem_cache_create("romfs_inode_cache", |
581 | sizeof(struct romfs_inode_info), | 581 | sizeof(struct romfs_inode_info), |
582 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 582 | 0, (SLAB_RECLAIM_ACCOUNT| |
583 | SLAB_MEM_SPREAD), | ||
583 | init_once, NULL); | 584 | init_once, NULL); |
584 | if (romfs_inode_cachep == NULL) | 585 | if (romfs_inode_cachep == NULL) |
585 | return -ENOMEM; | 586 | return -ENOMEM; |
diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c index 9b14542cc186..44ed1d418b46 100644 --- a/fs/smbfs/inode.c +++ b/fs/smbfs/inode.c | |||
@@ -80,7 +80,8 @@ static int init_inodecache(void) | |||
80 | { | 80 | { |
81 | smb_inode_cachep = kmem_cache_create("smb_inode_cache", | 81 | smb_inode_cachep = kmem_cache_create("smb_inode_cache", |
82 | sizeof(struct smb_inode_info), | 82 | sizeof(struct smb_inode_info), |
83 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 83 | 0, (SLAB_RECLAIM_ACCOUNT| |
84 | SLAB_MEM_SPREAD), | ||
84 | init_once, NULL); | 85 | init_once, NULL); |
85 | if (smb_inode_cachep == NULL) | 86 | if (smb_inode_cachep == NULL) |
86 | return -ENOMEM; | 87 | return -ENOMEM; |
diff --git a/fs/udf/super.c b/fs/udf/super.c index e120f33f8473..e45789fe38e8 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c | |||
@@ -140,7 +140,8 @@ static int init_inodecache(void) | |||
140 | { | 140 | { |
141 | udf_inode_cachep = kmem_cache_create("udf_inode_cache", | 141 | udf_inode_cachep = kmem_cache_create("udf_inode_cache", |
142 | sizeof(struct udf_inode_info), | 142 | sizeof(struct udf_inode_info), |
143 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 143 | 0, (SLAB_RECLAIM_ACCOUNT| |
144 | SLAB_MEM_SPREAD), | ||
144 | init_once, NULL); | 145 | init_once, NULL); |
145 | if (udf_inode_cachep == NULL) | 146 | if (udf_inode_cachep == NULL) |
146 | return -ENOMEM; | 147 | return -ENOMEM; |
diff --git a/fs/ufs/super.c b/fs/ufs/super.c index 684018d3c58e..d257644a1aeb 100644 --- a/fs/ufs/super.c +++ b/fs/ufs/super.c | |||
@@ -1184,7 +1184,8 @@ static int init_inodecache(void) | |||
1184 | { | 1184 | { |
1185 | ufs_inode_cachep = kmem_cache_create("ufs_inode_cache", | 1185 | ufs_inode_cachep = kmem_cache_create("ufs_inode_cache", |
1186 | sizeof(struct ufs_inode_info), | 1186 | sizeof(struct ufs_inode_info), |
1187 | 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 1187 | 0, (SLAB_RECLAIM_ACCOUNT| |
1188 | SLAB_MEM_SPREAD), | ||
1188 | init_once, NULL); | 1189 | init_once, NULL); |
1189 | if (ufs_inode_cachep == NULL) | 1190 | if (ufs_inode_cachep == NULL) |
1190 | return -ENOMEM; | 1191 | return -ENOMEM; |
diff --git a/net/socket.c b/net/socket.c index 7a5a56874efa..5211ba270375 100644 --- a/net/socket.c +++ b/net/socket.c | |||
@@ -319,7 +319,8 @@ static int init_inodecache(void) | |||
319 | { | 319 | { |
320 | sock_inode_cachep = kmem_cache_create("sock_inode_cache", | 320 | sock_inode_cachep = kmem_cache_create("sock_inode_cache", |
321 | sizeof(struct socket_alloc), | 321 | 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), | ||
323 | init_once, NULL); | 324 | init_once, NULL); |
324 | if (sock_inode_cachep == NULL) | 325 | if (sock_inode_cachep == NULL) |
325 | return -ENOMEM; | 326 | return -ENOMEM; |
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index befc0c5ca9e5..ad9d9fc4e734 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c | |||
@@ -849,9 +849,10 @@ init_once(void * foo, kmem_cache_t * cachep, unsigned long flags) | |||
849 | int register_rpc_pipefs(void) | 849 | int register_rpc_pipefs(void) |
850 | { | 850 | { |
851 | rpc_inode_cachep = kmem_cache_create("rpc_inode_cache", | 851 | rpc_inode_cachep = kmem_cache_create("rpc_inode_cache", |
852 | sizeof(struct rpc_inode), | 852 | sizeof(struct rpc_inode), |
853 | 0, SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, | 853 | 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| |
854 | init_once, NULL); | 854 | SLAB_MEM_SPREAD), |
855 | init_once, NULL); | ||
855 | if (!rpc_inode_cachep) | 856 | if (!rpc_inode_cachep) |
856 | return -ENOMEM; | 857 | return -ENOMEM; |
857 | register_filesystem(&rpc_pipe_fs_type); | 858 | register_filesystem(&rpc_pipe_fs_type); |