aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-07-19 21:11:58 -0400
committerPaul Mundt <lethal@linux-sh.org>2007-07-19 21:11:58 -0400
commit20c2df83d25c6a95affe6157a4c9cac4cf5ffaac (patch)
tree415c4453d2b17a50abe7a3e515177e1fa337bd67 /fs
parent64fb98fc40738ae1a98bcea9ca3145b89fb71524 (diff)
mm: Remove slab destructors from kmem_cache_create().
Slab destructors were no longer supported after Christoph's c59def9f222d44bb7e2f0a559f2906191a0862d7 change. They've been BUGs for both slab and slub, and slob never supported them either. This rips out support for the dtor pointer from kmem_cache_create() completely and fixes up every single callsite in the kernel (there were about 224, not including the slab allocator definitions themselves, or the documentation references). Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/adfs/super.c4
-rw-r--r--fs/affs/super.c2
-rw-r--r--fs/afs/super.c3
-rw-r--r--fs/befs/linuxvfs.c4
-rw-r--r--fs/bfs/inode.c4
-rw-r--r--fs/bio.c2
-rw-r--r--fs/block_dev.c2
-rw-r--r--fs/cifs/cifsfs.c10
-rw-r--r--fs/coda/inode.c4
-rw-r--r--fs/configfs/mount.c2
-rw-r--r--fs/dcache.c4
-rw-r--r--fs/dcookies.c2
-rw-r--r--fs/dlm/lowcomms.c2
-rw-r--r--fs/dlm/memory.c2
-rw-r--r--fs/dnotify.c2
-rw-r--r--fs/dquot.c4
-rw-r--r--fs/ecryptfs/main.c2
-rw-r--r--fs/efs/super.c4
-rw-r--r--fs/eventpoll.c4
-rw-r--r--fs/ext2/super.c4
-rw-r--r--fs/ext3/super.c2
-rw-r--r--fs/ext4/super.c2
-rw-r--r--fs/fat/cache.c2
-rw-r--r--fs/fat/inode.c2
-rw-r--r--fs/fcntl.c2
-rw-r--r--fs/freevxfs/vxfs_super.c4
-rw-r--r--fs/fuse/dev.c2
-rw-r--r--fs/fuse/inode.c2
-rw-r--r--fs/gfs2/main.c6
-rw-r--r--fs/hfs/super.c2
-rw-r--r--fs/hfsplus/super.c2
-rw-r--r--fs/hpfs/super.c4
-rw-r--r--fs/hugetlbfs/inode.c2
-rw-r--r--fs/inode.c3
-rw-r--r--fs/inotify_user.c4
-rw-r--r--fs/isofs/inode.c2
-rw-r--r--fs/jbd/journal.c8
-rw-r--r--fs/jbd/revoke.c4
-rw-r--r--fs/jbd2/journal.c8
-rw-r--r--fs/jbd2/revoke.c4
-rw-r--r--fs/jffs2/malloc.c18
-rw-r--r--fs/jffs2/super.c2
-rw-r--r--fs/jfs/jfs_metapage.c2
-rw-r--r--fs/jfs/super.c2
-rw-r--r--fs/locks.c2
-rw-r--r--fs/mbcache.c2
-rw-r--r--fs/minix/inode.c4
-rw-r--r--fs/namespace.c2
-rw-r--r--fs/ncpfs/inode.c4
-rw-r--r--fs/nfs/direct.c2
-rw-r--r--fs/nfs/inode.c4
-rw-r--r--fs/nfs/pagelist.c2
-rw-r--r--fs/nfs/read.c2
-rw-r--r--fs/nfs/write.c2
-rw-r--r--fs/nfsd/nfs4state.c8
-rw-r--r--fs/ntfs/super.c10
-rw-r--r--fs/ocfs2/dlm/dlmfs.c2
-rw-r--r--fs/ocfs2/dlm/dlmmaster.c2
-rw-r--r--fs/ocfs2/super.c2
-rw-r--r--fs/ocfs2/uptodate.c2
-rw-r--r--fs/openpromfs/inode.c2
-rw-r--r--fs/proc/inode.c4
-rw-r--r--fs/qnx4/inode.c2
-rw-r--r--fs/reiserfs/super.c2
-rw-r--r--fs/romfs/inode.c4
-rw-r--r--fs/smbfs/inode.c4
-rw-r--r--fs/smbfs/request.c2
-rw-r--r--fs/sysfs/mount.c2
-rw-r--r--fs/sysv/inode.c2
-rw-r--r--fs/udf/super.c2
-rw-r--r--fs/ufs/super.c4
-rw-r--r--fs/xfs/linux-2.6/kmem.h4
72 files changed, 119 insertions, 125 deletions
diff --git a/fs/adfs/super.c b/fs/adfs/super.c
index de2ed5ca3351..1c9fd3029496 100644
--- a/fs/adfs/super.c
+++ b/fs/adfs/super.c
@@ -234,14 +234,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
234 234
235 inode_init_once(&ei->vfs_inode); 235 inode_init_once(&ei->vfs_inode);
236} 236}
237 237
238static int init_inodecache(void) 238static int init_inodecache(void)
239{ 239{
240 adfs_inode_cachep = kmem_cache_create("adfs_inode_cache", 240 adfs_inode_cachep = kmem_cache_create("adfs_inode_cache",
241 sizeof(struct adfs_inode_info), 241 sizeof(struct adfs_inode_info),
242 0, (SLAB_RECLAIM_ACCOUNT| 242 0, (SLAB_RECLAIM_ACCOUNT|
243 SLAB_MEM_SPREAD), 243 SLAB_MEM_SPREAD),
244 init_once, NULL); 244 init_once);
245 if (adfs_inode_cachep == NULL) 245 if (adfs_inode_cachep == NULL)
246 return -ENOMEM; 246 return -ENOMEM;
247 return 0; 247 return 0;
diff --git a/fs/affs/super.c b/fs/affs/super.c
index 6d0ebc321530..c80191ae2059 100644
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -99,7 +99,7 @@ static int init_inodecache(void)
99 sizeof(struct affs_inode_info), 99 sizeof(struct affs_inode_info),
100 0, (SLAB_RECLAIM_ACCOUNT| 100 0, (SLAB_RECLAIM_ACCOUNT|
101 SLAB_MEM_SPREAD), 101 SLAB_MEM_SPREAD),
102 init_once, NULL); 102 init_once);
103 if (affs_inode_cachep == NULL) 103 if (affs_inode_cachep == NULL)
104 return -ENOMEM; 104 return -ENOMEM;
105 return 0; 105 return 0;
diff --git a/fs/afs/super.c b/fs/afs/super.c
index 993cdf1cce3a..b8808b40f82b 100644
--- a/fs/afs/super.c
+++ b/fs/afs/super.c
@@ -89,8 +89,7 @@ int __init afs_fs_init(void)
89 sizeof(struct afs_vnode), 89 sizeof(struct afs_vnode),
90 0, 90 0,
91 SLAB_HWCACHE_ALIGN, 91 SLAB_HWCACHE_ALIGN,
92 afs_i_init_once, 92 afs_i_init_once);
93 NULL);
94 if (!afs_inode_cachep) { 93 if (!afs_inode_cachep) {
95 printk(KERN_NOTICE "kAFS: Failed to allocate inode cache\n"); 94 printk(KERN_NOTICE "kAFS: Failed to allocate inode cache\n");
96 return ret; 95 return ret;
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
index a5c5171c2828..a45141827681 100644
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@ -414,7 +414,7 @@ befs_read_inode(struct inode *inode)
414} 414}
415 415
416/* Initialize the inode cache. Called at fs setup. 416/* Initialize the inode cache. Called at fs setup.
417 * 417 *
418 * Taken from NFS implementation by Al Viro. 418 * Taken from NFS implementation by Al Viro.
419 */ 419 */
420static int 420static int
@@ -424,7 +424,7 @@ befs_init_inodecache(void)
424 sizeof (struct befs_inode_info), 424 sizeof (struct befs_inode_info),
425 0, (SLAB_RECLAIM_ACCOUNT| 425 0, (SLAB_RECLAIM_ACCOUNT|
426 SLAB_MEM_SPREAD), 426 SLAB_MEM_SPREAD),
427 init_once, NULL); 427 init_once);
428 if (befs_inode_cachep == NULL) { 428 if (befs_inode_cachep == NULL) {
429 printk(KERN_ERR "befs_init_inodecache: " 429 printk(KERN_ERR "befs_init_inodecache: "
430 "Couldn't initalize inode slabcache\n"); 430 "Couldn't initalize inode slabcache\n");
diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c
index 58c7bd9f5301..f346eb14e86f 100644
--- a/fs/bfs/inode.c
+++ b/fs/bfs/inode.c
@@ -250,14 +250,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
250 250
251 inode_init_once(&bi->vfs_inode); 251 inode_init_once(&bi->vfs_inode);
252} 252}
253 253
254static int init_inodecache(void) 254static int init_inodecache(void)
255{ 255{
256 bfs_inode_cachep = kmem_cache_create("bfs_inode_cache", 256 bfs_inode_cachep = kmem_cache_create("bfs_inode_cache",
257 sizeof(struct bfs_inode_info), 257 sizeof(struct bfs_inode_info),
258 0, (SLAB_RECLAIM_ACCOUNT| 258 0, (SLAB_RECLAIM_ACCOUNT|
259 SLAB_MEM_SPREAD), 259 SLAB_MEM_SPREAD),
260 init_once, NULL); 260 init_once);
261 if (bfs_inode_cachep == NULL) 261 if (bfs_inode_cachep == NULL)
262 return -ENOMEM; 262 return -ENOMEM;
263 return 0; 263 return 0;
diff --git a/fs/bio.c b/fs/bio.c
index 33e46340a766..0d2c2d38b7ba 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -1187,7 +1187,7 @@ static void __init biovec_init_slabs(void)
1187 1187
1188 size = bvs->nr_vecs * sizeof(struct bio_vec); 1188 size = bvs->nr_vecs * sizeof(struct bio_vec);
1189 bvs->slab = kmem_cache_create(bvs->name, size, 0, 1189 bvs->slab = kmem_cache_create(bvs->name, size, 0,
1190 SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL); 1190 SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
1191 } 1191 }
1192} 1192}
1193 1193
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 3635315e3b99..2980eabe5779 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -517,7 +517,7 @@ void __init bdev_cache_init(void)
517 bdev_cachep = kmem_cache_create("bdev_cache", sizeof(struct bdev_inode), 517 bdev_cachep = kmem_cache_create("bdev_cache", sizeof(struct bdev_inode),
518 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| 518 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
519 SLAB_MEM_SPREAD|SLAB_PANIC), 519 SLAB_MEM_SPREAD|SLAB_PANIC),
520 init_once, NULL); 520 init_once);
521 err = register_filesystem(&bd_type); 521 err = register_filesystem(&bd_type);
522 if (err) 522 if (err)
523 panic("Cannot register bdev pseudo-fs"); 523 panic("Cannot register bdev pseudo-fs");
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 1fd0dc85f53c..cabb6a55d7dd 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -719,7 +719,7 @@ cifs_init_inodecache(void)
719 sizeof (struct cifsInodeInfo), 719 sizeof (struct cifsInodeInfo),
720 0, (SLAB_RECLAIM_ACCOUNT| 720 0, (SLAB_RECLAIM_ACCOUNT|
721 SLAB_MEM_SPREAD), 721 SLAB_MEM_SPREAD),
722 cifs_init_once, NULL); 722 cifs_init_once);
723 if (cifs_inode_cachep == NULL) 723 if (cifs_inode_cachep == NULL)
724 return -ENOMEM; 724 return -ENOMEM;
725 725
@@ -748,7 +748,7 @@ cifs_init_request_bufs(void)
748 cifs_req_cachep = kmem_cache_create("cifs_request", 748 cifs_req_cachep = kmem_cache_create("cifs_request",
749 CIFSMaxBufSize + 749 CIFSMaxBufSize +
750 MAX_CIFS_HDR_SIZE, 0, 750 MAX_CIFS_HDR_SIZE, 0,
751 SLAB_HWCACHE_ALIGN, NULL, NULL); 751 SLAB_HWCACHE_ALIGN, NULL);
752 if (cifs_req_cachep == NULL) 752 if (cifs_req_cachep == NULL)
753 return -ENOMEM; 753 return -ENOMEM;
754 754
@@ -776,7 +776,7 @@ cifs_init_request_bufs(void)
776 alloc of large cifs buffers even when page debugging is on */ 776 alloc of large cifs buffers even when page debugging is on */
777 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq", 777 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
778 MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN, 778 MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
779 NULL, NULL); 779 NULL);
780 if (cifs_sm_req_cachep == NULL) { 780 if (cifs_sm_req_cachep == NULL) {
781 mempool_destroy(cifs_req_poolp); 781 mempool_destroy(cifs_req_poolp);
782 kmem_cache_destroy(cifs_req_cachep); 782 kmem_cache_destroy(cifs_req_cachep);
@@ -817,7 +817,7 @@ cifs_init_mids(void)
817{ 817{
818 cifs_mid_cachep = kmem_cache_create("cifs_mpx_ids", 818 cifs_mid_cachep = kmem_cache_create("cifs_mpx_ids",
819 sizeof (struct mid_q_entry), 0, 819 sizeof (struct mid_q_entry), 0,
820 SLAB_HWCACHE_ALIGN, NULL, NULL); 820 SLAB_HWCACHE_ALIGN, NULL);
821 if (cifs_mid_cachep == NULL) 821 if (cifs_mid_cachep == NULL)
822 return -ENOMEM; 822 return -ENOMEM;
823 823
@@ -830,7 +830,7 @@ cifs_init_mids(void)
830 830
831 cifs_oplock_cachep = kmem_cache_create("cifs_oplock_structs", 831 cifs_oplock_cachep = kmem_cache_create("cifs_oplock_structs",
832 sizeof (struct oplock_q_entry), 0, 832 sizeof (struct oplock_q_entry), 0,
833 SLAB_HWCACHE_ALIGN, NULL, NULL); 833 SLAB_HWCACHE_ALIGN, NULL);
834 if (cifs_oplock_cachep == NULL) { 834 if (cifs_oplock_cachep == NULL) {
835 mempool_destroy(cifs_mid_poolp); 835 mempool_destroy(cifs_mid_poolp);
836 kmem_cache_destroy(cifs_mid_cachep); 836 kmem_cache_destroy(cifs_mid_cachep);
diff --git a/fs/coda/inode.c b/fs/coda/inode.c
index 6771a4271e33..342f4e0d582e 100644
--- a/fs/coda/inode.c
+++ b/fs/coda/inode.c
@@ -64,13 +64,13 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
64 64
65 inode_init_once(&ei->vfs_inode); 65 inode_init_once(&ei->vfs_inode);
66} 66}
67 67
68int coda_init_inodecache(void) 68int coda_init_inodecache(void)
69{ 69{
70 coda_inode_cachep = kmem_cache_create("coda_inode_cache", 70 coda_inode_cachep = kmem_cache_create("coda_inode_cache",
71 sizeof(struct coda_inode_info), 71 sizeof(struct coda_inode_info),
72 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, 72 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
73 init_once, NULL); 73 init_once);
74 if (coda_inode_cachep == NULL) 74 if (coda_inode_cachep == NULL)
75 return -ENOMEM; 75 return -ENOMEM;
76 return 0; 76 return 0;
diff --git a/fs/configfs/mount.c b/fs/configfs/mount.c
index b00d962de833..871b0cb61839 100644
--- a/fs/configfs/mount.c
+++ b/fs/configfs/mount.c
@@ -136,7 +136,7 @@ static int __init configfs_init(void)
136 136
137 configfs_dir_cachep = kmem_cache_create("configfs_dir_cache", 137 configfs_dir_cachep = kmem_cache_create("configfs_dir_cache",
138 sizeof(struct configfs_dirent), 138 sizeof(struct configfs_dirent),
139 0, 0, NULL, NULL); 139 0, 0, NULL);
140 if (!configfs_dir_cachep) 140 if (!configfs_dir_cachep)
141 goto out; 141 goto out;
142 142
diff --git a/fs/dcache.c b/fs/dcache.c
index cb9d05056b54..678d39deb607 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -2165,10 +2165,10 @@ void __init vfs_caches_init(unsigned long mempages)
2165 mempages -= reserve; 2165 mempages -= reserve;
2166 2166
2167 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0, 2167 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
2168 SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL); 2168 SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
2169 2169
2170 filp_cachep = kmem_cache_create("filp", sizeof(struct file), 0, 2170 filp_cachep = kmem_cache_create("filp", sizeof(struct file), 0,
2171 SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL); 2171 SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
2172 2172
2173 dcache_init(mempages); 2173 dcache_init(mempages);
2174 inode_init(mempages); 2174 inode_init(mempages);
diff --git a/fs/dcookies.c b/fs/dcookies.c
index 21af1629f9bc..c1208f53bd74 100644
--- a/fs/dcookies.c
+++ b/fs/dcookies.c
@@ -205,7 +205,7 @@ static int dcookie_init(void)
205 205
206 dcookie_cache = kmem_cache_create("dcookie_cache", 206 dcookie_cache = kmem_cache_create("dcookie_cache",
207 sizeof(struct dcookie_struct), 207 sizeof(struct dcookie_struct),
208 0, 0, NULL, NULL); 208 0, 0, NULL);
209 209
210 if (!dcookie_cache) 210 if (!dcookie_cache)
211 goto out; 211 goto out;
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 0553a6158dcb..dd362739d291 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -1449,7 +1449,7 @@ int dlm_lowcomms_start(void)
1449 error = -ENOMEM; 1449 error = -ENOMEM;
1450 con_cache = kmem_cache_create("dlm_conn", sizeof(struct connection), 1450 con_cache = kmem_cache_create("dlm_conn", sizeof(struct connection),
1451 __alignof__(struct connection), 0, 1451 __alignof__(struct connection), 0,
1452 NULL, NULL); 1452 NULL);
1453 if (!con_cache) 1453 if (!con_cache)
1454 goto out; 1454 goto out;
1455 1455
diff --git a/fs/dlm/memory.c b/fs/dlm/memory.c
index fb9e2ee998ae..ecf0e5cb2035 100644
--- a/fs/dlm/memory.c
+++ b/fs/dlm/memory.c
@@ -23,7 +23,7 @@ int dlm_memory_init(void)
23 int ret = 0; 23 int ret = 0;
24 24
25 lkb_cache = kmem_cache_create("dlm_lkb", sizeof(struct dlm_lkb), 25 lkb_cache = kmem_cache_create("dlm_lkb", sizeof(struct dlm_lkb),
26 __alignof__(struct dlm_lkb), 0, NULL, NULL); 26 __alignof__(struct dlm_lkb), 0, NULL);
27 if (!lkb_cache) 27 if (!lkb_cache)
28 ret = -ENOMEM; 28 ret = -ENOMEM;
29 return ret; 29 return ret;
diff --git a/fs/dnotify.c b/fs/dnotify.c
index 936409fcd939..28d01ed66de0 100644
--- a/fs/dnotify.c
+++ b/fs/dnotify.c
@@ -176,7 +176,7 @@ EXPORT_SYMBOL_GPL(dnotify_parent);
176static int __init dnotify_init(void) 176static int __init dnotify_init(void)
177{ 177{
178 dn_cache = kmem_cache_create("dnotify_cache", 178 dn_cache = kmem_cache_create("dnotify_cache",
179 sizeof(struct dnotify_struct), 0, SLAB_PANIC, NULL, NULL); 179 sizeof(struct dnotify_struct), 0, SLAB_PANIC, NULL);
180 return 0; 180 return 0;
181} 181}
182 182
diff --git a/fs/dquot.c b/fs/dquot.c
index 7e273151f589..de9a29f64ff3 100644
--- a/fs/dquot.c
+++ b/fs/dquot.c
@@ -1848,11 +1848,11 @@ static int __init dquot_init(void)
1848 1848
1849 register_sysctl_table(sys_table); 1849 register_sysctl_table(sys_table);
1850 1850
1851 dquot_cachep = kmem_cache_create("dquot", 1851 dquot_cachep = kmem_cache_create("dquot",
1852 sizeof(struct dquot), sizeof(unsigned long) * 4, 1852 sizeof(struct dquot), sizeof(unsigned long) * 4,
1853 (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| 1853 (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
1854 SLAB_MEM_SPREAD|SLAB_PANIC), 1854 SLAB_MEM_SPREAD|SLAB_PANIC),
1855 NULL, NULL); 1855 NULL);
1856 1856
1857 order = 0; 1857 order = 0;
1858 dquot_hash = (struct hlist_head *)__get_free_pages(GFP_ATOMIC, order); 1858 dquot_hash = (struct hlist_head *)__get_free_pages(GFP_ATOMIC, order);
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index 02ca6f1e55d7..e557a6766927 100644
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -677,7 +677,7 @@ static int ecryptfs_init_kmem_caches(void)
677 677
678 info = &ecryptfs_cache_infos[i]; 678 info = &ecryptfs_cache_infos[i];
679 *(info->cache) = kmem_cache_create(info->name, info->size, 679 *(info->cache) = kmem_cache_create(info->name, info->size,
680 0, SLAB_HWCACHE_ALIGN, info->ctor, NULL); 680 0, SLAB_HWCACHE_ALIGN, info->ctor);
681 if (!*(info->cache)) { 681 if (!*(info->cache)) {
682 ecryptfs_free_kmem_caches(); 682 ecryptfs_free_kmem_caches();
683 ecryptfs_printk(KERN_WARNING, "%s: " 683 ecryptfs_printk(KERN_WARNING, "%s: "
diff --git a/fs/efs/super.c b/fs/efs/super.c
index d360c81f3a72..ce4acb8ff819 100644
--- a/fs/efs/super.c
+++ b/fs/efs/super.c
@@ -75,13 +75,13 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
75 75
76 inode_init_once(&ei->vfs_inode); 76 inode_init_once(&ei->vfs_inode);
77} 77}
78 78
79static int init_inodecache(void) 79static int init_inodecache(void)
80{ 80{
81 efs_inode_cachep = kmem_cache_create("efs_inode_cache", 81 efs_inode_cachep = kmem_cache_create("efs_inode_cache",
82 sizeof(struct efs_inode_info), 82 sizeof(struct efs_inode_info),
83 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, 83 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
84 init_once, NULL); 84 init_once);
85 if (efs_inode_cachep == NULL) 85 if (efs_inode_cachep == NULL)
86 return -ENOMEM; 86 return -ENOMEM;
87 return 0; 87 return 0;
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 0b73cd45a06d..77b9953624f4 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -1324,12 +1324,12 @@ static int __init eventpoll_init(void)
1324 /* Allocates slab cache used to allocate "struct epitem" items */ 1324 /* Allocates slab cache used to allocate "struct epitem" items */
1325 epi_cache = kmem_cache_create("eventpoll_epi", sizeof(struct epitem), 1325 epi_cache = kmem_cache_create("eventpoll_epi", sizeof(struct epitem),
1326 0, SLAB_HWCACHE_ALIGN|EPI_SLAB_DEBUG|SLAB_PANIC, 1326 0, SLAB_HWCACHE_ALIGN|EPI_SLAB_DEBUG|SLAB_PANIC,
1327 NULL, NULL); 1327 NULL);
1328 1328
1329 /* Allocates slab cache used to allocate "struct eppoll_entry" */ 1329 /* Allocates slab cache used to allocate "struct eppoll_entry" */
1330 pwq_cache = kmem_cache_create("eventpoll_pwq", 1330 pwq_cache = kmem_cache_create("eventpoll_pwq",
1331 sizeof(struct eppoll_entry), 0, 1331 sizeof(struct eppoll_entry), 0,
1332 EPI_SLAB_DEBUG|SLAB_PANIC, NULL, NULL); 1332 EPI_SLAB_DEBUG|SLAB_PANIC, NULL);
1333 1333
1334 return 0; 1334 return 0;
1335} 1335}
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index a6b1072daea7..68579a0ed3f0 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -167,14 +167,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
167#endif 167#endif
168 inode_init_once(&ei->vfs_inode); 168 inode_init_once(&ei->vfs_inode);
169} 169}
170 170
171static int init_inodecache(void) 171static int init_inodecache(void)
172{ 172{
173 ext2_inode_cachep = kmem_cache_create("ext2_inode_cache", 173 ext2_inode_cachep = kmem_cache_create("ext2_inode_cache",
174 sizeof(struct ext2_inode_info), 174 sizeof(struct ext2_inode_info),
175 0, (SLAB_RECLAIM_ACCOUNT| 175 0, (SLAB_RECLAIM_ACCOUNT|
176 SLAB_MEM_SPREAD), 176 SLAB_MEM_SPREAD),
177 init_once, NULL); 177 init_once);
178 if (ext2_inode_cachep == NULL) 178 if (ext2_inode_cachep == NULL)
179 return -ENOMEM; 179 return -ENOMEM;
180 return 0; 180 return 0;
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 4f84dc86628a..f0614e3f1fe8 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -490,7 +490,7 @@ static int init_inodecache(void)
490 sizeof(struct ext3_inode_info), 490 sizeof(struct ext3_inode_info),
491 0, (SLAB_RECLAIM_ACCOUNT| 491 0, (SLAB_RECLAIM_ACCOUNT|
492 SLAB_MEM_SPREAD), 492 SLAB_MEM_SPREAD),
493 init_once, NULL); 493 init_once);
494 if (ext3_inode_cachep == NULL) 494 if (ext3_inode_cachep == NULL)
495 return -ENOMEM; 495 return -ENOMEM;
496 return 0; 496 return 0;
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 6dcbb28dc06d..75adbb64e028 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -541,7 +541,7 @@ static int init_inodecache(void)
541 sizeof(struct ext4_inode_info), 541 sizeof(struct ext4_inode_info),
542 0, (SLAB_RECLAIM_ACCOUNT| 542 0, (SLAB_RECLAIM_ACCOUNT|
543 SLAB_MEM_SPREAD), 543 SLAB_MEM_SPREAD),
544 init_once, NULL); 544 init_once);
545 if (ext4_inode_cachep == NULL) 545 if (ext4_inode_cachep == NULL)
546 return -ENOMEM; 546 return -ENOMEM;
547 return 0; 547 return 0;
diff --git a/fs/fat/cache.c b/fs/fat/cache.c
index 3c9c8a15ec73..be6f89b152ca 100644
--- a/fs/fat/cache.c
+++ b/fs/fat/cache.c
@@ -48,7 +48,7 @@ int __init fat_cache_init(void)
48 fat_cache_cachep = kmem_cache_create("fat_cache", 48 fat_cache_cachep = kmem_cache_create("fat_cache",
49 sizeof(struct fat_cache), 49 sizeof(struct fat_cache),
50 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, 50 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
51 init_once, NULL); 51 init_once);
52 if (fat_cache_cachep == NULL) 52 if (fat_cache_cachep == NULL)
53 return -ENOMEM; 53 return -ENOMEM;
54 return 0; 54 return 0;
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 0a7ddb39a593..4baa5f205368 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -514,7 +514,7 @@ static int __init fat_init_inodecache(void)
514 sizeof(struct msdos_inode_info), 514 sizeof(struct msdos_inode_info),
515 0, (SLAB_RECLAIM_ACCOUNT| 515 0, (SLAB_RECLAIM_ACCOUNT|
516 SLAB_MEM_SPREAD), 516 SLAB_MEM_SPREAD),
517 init_once, NULL); 517 init_once);
518 if (fat_inode_cachep == NULL) 518 if (fat_inode_cachep == NULL)
519 return -ENOMEM; 519 return -ENOMEM;
520 return 0; 520 return 0;
diff --git a/fs/fcntl.c b/fs/fcntl.c
index 3f22e9f4f691..78b2ff044054 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -638,7 +638,7 @@ EXPORT_SYMBOL(kill_fasync);
638static int __init fasync_init(void) 638static int __init fasync_init(void)
639{ 639{
640 fasync_cache = kmem_cache_create("fasync_cache", 640 fasync_cache = kmem_cache_create("fasync_cache",
641 sizeof(struct fasync_struct), 0, SLAB_PANIC, NULL, NULL); 641 sizeof(struct fasync_struct), 0, SLAB_PANIC, NULL);
642 return 0; 642 return 0;
643} 643}
644 644
diff --git a/fs/freevxfs/vxfs_super.c b/fs/freevxfs/vxfs_super.c
index 647d600f0bc8..4f95572d2722 100644
--- a/fs/freevxfs/vxfs_super.c
+++ b/fs/freevxfs/vxfs_super.c
@@ -263,8 +263,8 @@ vxfs_init(void)
263 int rv; 263 int rv;
264 264
265 vxfs_inode_cachep = kmem_cache_create("vxfs_inode", 265 vxfs_inode_cachep = kmem_cache_create("vxfs_inode",
266 sizeof(struct vxfs_inode_info), 0, 266 sizeof(struct vxfs_inode_info), 0,
267 SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, NULL, NULL); 267 SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, NULL);
268 if (!vxfs_inode_cachep) 268 if (!vxfs_inode_cachep)
269 return -ENOMEM; 269 return -ENOMEM;
270 rv = register_filesystem(&vxfs_fs_type); 270 rv = register_filesystem(&vxfs_fs_type);
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 357764d85ff1..3ad22beb24c2 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -1044,7 +1044,7 @@ int __init fuse_dev_init(void)
1044 int err = -ENOMEM; 1044 int err = -ENOMEM;
1045 fuse_req_cachep = kmem_cache_create("fuse_request", 1045 fuse_req_cachep = kmem_cache_create("fuse_request",
1046 sizeof(struct fuse_req), 1046 sizeof(struct fuse_req),
1047 0, 0, NULL, NULL); 1047 0, 0, NULL);
1048 if (!fuse_req_cachep) 1048 if (!fuse_req_cachep)
1049 goto out; 1049 goto out;
1050 1050
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index cc5efc13496a..5448f625ab56 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -706,7 +706,7 @@ static int __init fuse_fs_init(void)
706 fuse_inode_cachep = kmem_cache_create("fuse_inode", 706 fuse_inode_cachep = kmem_cache_create("fuse_inode",
707 sizeof(struct fuse_inode), 707 sizeof(struct fuse_inode),
708 0, SLAB_HWCACHE_ALIGN, 708 0, SLAB_HWCACHE_ALIGN,
709 fuse_inode_init_once, NULL); 709 fuse_inode_init_once);
710 err = -ENOMEM; 710 err = -ENOMEM;
711 if (!fuse_inode_cachep) 711 if (!fuse_inode_cachep)
712 goto out_unreg2; 712 goto out_unreg2;
diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c
index 787a0edef100..d5d4e68b8807 100644
--- a/fs/gfs2/main.c
+++ b/fs/gfs2/main.c
@@ -72,7 +72,7 @@ static int __init init_gfs2_fs(void)
72 gfs2_glock_cachep = kmem_cache_create("gfs2_glock", 72 gfs2_glock_cachep = kmem_cache_create("gfs2_glock",
73 sizeof(struct gfs2_glock), 73 sizeof(struct gfs2_glock),
74 0, 0, 74 0, 0,
75 gfs2_init_glock_once, NULL); 75 gfs2_init_glock_once);
76 if (!gfs2_glock_cachep) 76 if (!gfs2_glock_cachep)
77 goto fail; 77 goto fail;
78 78
@@ -80,13 +80,13 @@ static int __init init_gfs2_fs(void)
80 sizeof(struct gfs2_inode), 80 sizeof(struct gfs2_inode),
81 0, SLAB_RECLAIM_ACCOUNT| 81 0, SLAB_RECLAIM_ACCOUNT|
82 SLAB_MEM_SPREAD, 82 SLAB_MEM_SPREAD,
83 gfs2_init_inode_once, NULL); 83 gfs2_init_inode_once);
84 if (!gfs2_inode_cachep) 84 if (!gfs2_inode_cachep)
85 goto fail; 85 goto fail;
86 86
87 gfs2_bufdata_cachep = kmem_cache_create("gfs2_bufdata", 87 gfs2_bufdata_cachep = kmem_cache_create("gfs2_bufdata",
88 sizeof(struct gfs2_bufdata), 88 sizeof(struct gfs2_bufdata),
89 0, 0, NULL, NULL); 89 0, 0, NULL);
90 if (!gfs2_bufdata_cachep) 90 if (!gfs2_bufdata_cachep)
91 goto fail; 91 goto fail;
92 92
diff --git a/fs/hfs/super.c b/fs/hfs/super.c
index 92cf8751e428..6c5f92dfb500 100644
--- a/fs/hfs/super.c
+++ b/fs/hfs/super.c
@@ -443,7 +443,7 @@ static int __init init_hfs_fs(void)
443 443
444 hfs_inode_cachep = kmem_cache_create("hfs_inode_cache", 444 hfs_inode_cachep = kmem_cache_create("hfs_inode_cache",
445 sizeof(struct hfs_inode_info), 0, SLAB_HWCACHE_ALIGN, 445 sizeof(struct hfs_inode_info), 0, SLAB_HWCACHE_ALIGN,
446 hfs_init_once, NULL); 446 hfs_init_once);
447 if (!hfs_inode_cachep) 447 if (!hfs_inode_cachep)
448 return -ENOMEM; 448 return -ENOMEM;
449 err = register_filesystem(&hfs_fs_type); 449 err = register_filesystem(&hfs_fs_type);
diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
index 6d87a2a9534d..7b0f2e5a44e2 100644
--- a/fs/hfsplus/super.c
+++ b/fs/hfsplus/super.c
@@ -479,7 +479,7 @@ static int __init init_hfsplus_fs(void)
479 479
480 hfsplus_inode_cachep = kmem_cache_create("hfsplus_icache", 480 hfsplus_inode_cachep = kmem_cache_create("hfsplus_icache",
481 HFSPLUS_INODE_SIZE, 0, SLAB_HWCACHE_ALIGN, 481 HFSPLUS_INODE_SIZE, 0, SLAB_HWCACHE_ALIGN,
482 hfsplus_init_once, NULL); 482 hfsplus_init_once);
483 if (!hfsplus_inode_cachep) 483 if (!hfsplus_inode_cachep)
484 return -ENOMEM; 484 return -ENOMEM;
485 err = register_filesystem(&hfsplus_fs_type); 485 err = register_filesystem(&hfsplus_fs_type);
diff --git a/fs/hpfs/super.c b/fs/hpfs/super.c
index 29cc34abb2ea..89612ee7c80d 100644
--- a/fs/hpfs/super.c
+++ b/fs/hpfs/super.c
@@ -181,14 +181,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
181 mutex_init(&ei->i_parent_mutex); 181 mutex_init(&ei->i_parent_mutex);
182 inode_init_once(&ei->vfs_inode); 182 inode_init_once(&ei->vfs_inode);
183} 183}
184 184
185static int init_inodecache(void) 185static int init_inodecache(void)
186{ 186{
187 hpfs_inode_cachep = kmem_cache_create("hpfs_inode_cache", 187 hpfs_inode_cachep = kmem_cache_create("hpfs_inode_cache",
188 sizeof(struct hpfs_inode_info), 188 sizeof(struct hpfs_inode_info),
189 0, (SLAB_RECLAIM_ACCOUNT| 189 0, (SLAB_RECLAIM_ACCOUNT|
190 SLAB_MEM_SPREAD), 190 SLAB_MEM_SPREAD),
191 init_once, NULL); 191 init_once);
192 if (hpfs_inode_cachep == NULL) 192 if (hpfs_inode_cachep == NULL)
193 return -ENOMEM; 193 return -ENOMEM;
194 return 0; 194 return 0;
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index d145cb79c30a..c848a191525d 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -848,7 +848,7 @@ static int __init init_hugetlbfs_fs(void)
848 848
849 hugetlbfs_inode_cachep = kmem_cache_create("hugetlbfs_inode_cache", 849 hugetlbfs_inode_cachep = kmem_cache_create("hugetlbfs_inode_cache",
850 sizeof(struct hugetlbfs_inode_info), 850 sizeof(struct hugetlbfs_inode_info),
851 0, 0, init_once, NULL); 851 0, 0, init_once);
852 if (hugetlbfs_inode_cachep == NULL) 852 if (hugetlbfs_inode_cachep == NULL)
853 return -ENOMEM; 853 return -ENOMEM;
854 854
diff --git a/fs/inode.c b/fs/inode.c
index 320e088d0b28..29f5068f819b 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1388,8 +1388,7 @@ void __init inode_init(unsigned long mempages)
1388 0, 1388 0,
1389 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC| 1389 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
1390 SLAB_MEM_SPREAD), 1390 SLAB_MEM_SPREAD),
1391 init_once, 1391 init_once);
1392 NULL);
1393 register_shrinker(&icache_shrinker); 1392 register_shrinker(&icache_shrinker);
1394 1393
1395 /* Hash may have been set up in inode_init_early */ 1394 /* Hash may have been set up in inode_init_early */
diff --git a/fs/inotify_user.c b/fs/inotify_user.c
index 9f2224f65a18..9bf2f6c09df6 100644
--- a/fs/inotify_user.c
+++ b/fs/inotify_user.c
@@ -716,10 +716,10 @@ static int __init inotify_user_setup(void)
716 716
717 watch_cachep = kmem_cache_create("inotify_watch_cache", 717 watch_cachep = kmem_cache_create("inotify_watch_cache",
718 sizeof(struct inotify_user_watch), 718 sizeof(struct inotify_user_watch),
719 0, SLAB_PANIC, NULL, NULL); 719 0, SLAB_PANIC, NULL);
720 event_cachep = kmem_cache_create("inotify_event_cache", 720 event_cachep = kmem_cache_create("inotify_event_cache",
721 sizeof(struct inotify_kernel_event), 721 sizeof(struct inotify_kernel_event),
722 0, SLAB_PANIC, NULL, NULL); 722 0, SLAB_PANIC, NULL);
723 723
724 return 0; 724 return 0;
725} 725}
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index 4f5418be0590..95c72aa81867 100644
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -86,7 +86,7 @@ static int init_inodecache(void)
86 sizeof(struct iso_inode_info), 86 sizeof(struct iso_inode_info),
87 0, (SLAB_RECLAIM_ACCOUNT| 87 0, (SLAB_RECLAIM_ACCOUNT|
88 SLAB_MEM_SPREAD), 88 SLAB_MEM_SPREAD),
89 init_once, NULL); 89 init_once);
90 if (isofs_inode_cachep == NULL) 90 if (isofs_inode_cachep == NULL)
91 return -ENOMEM; 91 return -ENOMEM;
92 return 0; 92 return 0;
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index 46fe7439fb91..06ab3c10b1b8 100644
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -1668,7 +1668,7 @@ static int journal_create_jbd_slab(size_t slab_size)
1668 * boundary. 1668 * boundary.
1669 */ 1669 */
1670 jbd_slab[i] = kmem_cache_create(jbd_slab_names[i], 1670 jbd_slab[i] = kmem_cache_create(jbd_slab_names[i],
1671 slab_size, slab_size, 0, NULL, NULL); 1671 slab_size, slab_size, 0, NULL);
1672 if (!jbd_slab[i]) { 1672 if (!jbd_slab[i]) {
1673 printk(KERN_EMERG "JBD: no memory for jbd_slab cache\n"); 1673 printk(KERN_EMERG "JBD: no memory for jbd_slab cache\n");
1674 return -ENOMEM; 1674 return -ENOMEM;
@@ -1711,8 +1711,7 @@ static int journal_init_journal_head_cache(void)
1711 sizeof(struct journal_head), 1711 sizeof(struct journal_head),
1712 0, /* offset */ 1712 0, /* offset */
1713 0, /* flags */ 1713 0, /* flags */
1714 NULL, /* ctor */ 1714 NULL); /* ctor */
1715 NULL); /* dtor */
1716 retval = 0; 1715 retval = 0;
1717 if (journal_head_cache == 0) { 1716 if (journal_head_cache == 0) {
1718 retval = -ENOMEM; 1717 retval = -ENOMEM;
@@ -2008,8 +2007,7 @@ static int __init journal_init_handle_cache(void)
2008 sizeof(handle_t), 2007 sizeof(handle_t),
2009 0, /* offset */ 2008 0, /* offset */
2010 0, /* flags */ 2009 0, /* flags */
2011 NULL, /* ctor */ 2010 NULL); /* ctor */
2012 NULL); /* dtor */
2013 if (jbd_handle_cache == NULL) { 2011 if (jbd_handle_cache == NULL) {
2014 printk(KERN_EMERG "JBD: failed to create handle cache\n"); 2012 printk(KERN_EMERG "JBD: failed to create handle cache\n");
2015 return -ENOMEM; 2013 return -ENOMEM;
diff --git a/fs/jbd/revoke.c b/fs/jbd/revoke.c
index 8db2fa25170b..62e13c8db132 100644
--- a/fs/jbd/revoke.c
+++ b/fs/jbd/revoke.c
@@ -170,13 +170,13 @@ int __init journal_init_revoke_caches(void)
170{ 170{
171 revoke_record_cache = kmem_cache_create("revoke_record", 171 revoke_record_cache = kmem_cache_create("revoke_record",
172 sizeof(struct jbd_revoke_record_s), 172 sizeof(struct jbd_revoke_record_s),
173 0, SLAB_HWCACHE_ALIGN, NULL, NULL); 173 0, SLAB_HWCACHE_ALIGN, NULL);
174 if (revoke_record_cache == 0) 174 if (revoke_record_cache == 0)
175 return -ENOMEM; 175 return -ENOMEM;
176 176
177 revoke_table_cache = kmem_cache_create("revoke_table", 177 revoke_table_cache = kmem_cache_create("revoke_table",
178 sizeof(struct jbd_revoke_table_s), 178 sizeof(struct jbd_revoke_table_s),
179 0, 0, NULL, NULL); 179 0, 0, NULL);
180 if (revoke_table_cache == 0) { 180 if (revoke_table_cache == 0) {
181 kmem_cache_destroy(revoke_record_cache); 181 kmem_cache_destroy(revoke_record_cache);
182 revoke_record_cache = NULL; 182 revoke_record_cache = NULL;
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index f290cb7cb834..f37324aee817 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -1680,7 +1680,7 @@ static int jbd2_journal_create_jbd_slab(size_t slab_size)
1680 * boundary. 1680 * boundary.
1681 */ 1681 */
1682 jbd_slab[i] = kmem_cache_create(jbd_slab_names[i], 1682 jbd_slab[i] = kmem_cache_create(jbd_slab_names[i],
1683 slab_size, slab_size, 0, NULL, NULL); 1683 slab_size, slab_size, 0, NULL);
1684 if (!jbd_slab[i]) { 1684 if (!jbd_slab[i]) {
1685 printk(KERN_EMERG "JBD: no memory for jbd_slab cache\n"); 1685 printk(KERN_EMERG "JBD: no memory for jbd_slab cache\n");
1686 return -ENOMEM; 1686 return -ENOMEM;
@@ -1723,8 +1723,7 @@ static int journal_init_jbd2_journal_head_cache(void)
1723 sizeof(struct journal_head), 1723 sizeof(struct journal_head),
1724 0, /* offset */ 1724 0, /* offset */
1725 0, /* flags */ 1725 0, /* flags */
1726 NULL, /* ctor */ 1726 NULL); /* ctor */
1727 NULL); /* dtor */
1728 retval = 0; 1727 retval = 0;
1729 if (jbd2_journal_head_cache == 0) { 1728 if (jbd2_journal_head_cache == 0) {
1730 retval = -ENOMEM; 1729 retval = -ENOMEM;
@@ -2006,8 +2005,7 @@ static int __init journal_init_handle_cache(void)
2006 sizeof(handle_t), 2005 sizeof(handle_t),
2007 0, /* offset */ 2006 0, /* offset */
2008 0, /* flags */ 2007 0, /* flags */
2009 NULL, /* ctor */ 2008 NULL); /* ctor */
2010 NULL); /* dtor */
2011 if (jbd2_handle_cache == NULL) { 2009 if (jbd2_handle_cache == NULL) {
2012 printk(KERN_EMERG "JBD: failed to create handle cache\n"); 2010 printk(KERN_EMERG "JBD: failed to create handle cache\n");
2013 return -ENOMEM; 2011 return -ENOMEM;
diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c
index 28cac049a56b..01d88975e0c5 100644
--- a/fs/jbd2/revoke.c
+++ b/fs/jbd2/revoke.c
@@ -171,13 +171,13 @@ int __init jbd2_journal_init_revoke_caches(void)
171{ 171{
172 jbd2_revoke_record_cache = kmem_cache_create("jbd2_revoke_record", 172 jbd2_revoke_record_cache = kmem_cache_create("jbd2_revoke_record",
173 sizeof(struct jbd2_revoke_record_s), 173 sizeof(struct jbd2_revoke_record_s),
174 0, SLAB_HWCACHE_ALIGN, NULL, NULL); 174 0, SLAB_HWCACHE_ALIGN, NULL);
175 if (jbd2_revoke_record_cache == 0) 175 if (jbd2_revoke_record_cache == 0)
176 return -ENOMEM; 176 return -ENOMEM;
177 177
178 jbd2_revoke_table_cache = kmem_cache_create("jbd2_revoke_table", 178 jbd2_revoke_table_cache = kmem_cache_create("jbd2_revoke_table",
179 sizeof(struct jbd2_revoke_table_s), 179 sizeof(struct jbd2_revoke_table_s),
180 0, 0, NULL, NULL); 180 0, 0, NULL);
181 if (jbd2_revoke_table_cache == 0) { 181 if (jbd2_revoke_table_cache == 0) {
182 kmem_cache_destroy(jbd2_revoke_record_cache); 182 kmem_cache_destroy(jbd2_revoke_record_cache);
183 jbd2_revoke_record_cache = NULL; 183 jbd2_revoke_record_cache = NULL;
diff --git a/fs/jffs2/malloc.c b/fs/jffs2/malloc.c
index 35c1a5e30ba1..f9211252b5f1 100644
--- a/fs/jffs2/malloc.c
+++ b/fs/jffs2/malloc.c
@@ -33,56 +33,56 @@ int __init jffs2_create_slab_caches(void)
33{ 33{
34 full_dnode_slab = kmem_cache_create("jffs2_full_dnode", 34 full_dnode_slab = kmem_cache_create("jffs2_full_dnode",
35 sizeof(struct jffs2_full_dnode), 35 sizeof(struct jffs2_full_dnode),
36 0, 0, NULL, NULL); 36 0, 0, NULL);
37 if (!full_dnode_slab) 37 if (!full_dnode_slab)
38 goto err; 38 goto err;
39 39
40 raw_dirent_slab = kmem_cache_create("jffs2_raw_dirent", 40 raw_dirent_slab = kmem_cache_create("jffs2_raw_dirent",
41 sizeof(struct jffs2_raw_dirent), 41 sizeof(struct jffs2_raw_dirent),
42 0, 0, NULL, NULL); 42 0, 0, NULL);
43 if (!raw_dirent_slab) 43 if (!raw_dirent_slab)
44 goto err; 44 goto err;
45 45
46 raw_inode_slab = kmem_cache_create("jffs2_raw_inode", 46 raw_inode_slab = kmem_cache_create("jffs2_raw_inode",
47 sizeof(struct jffs2_raw_inode), 47 sizeof(struct jffs2_raw_inode),
48 0, 0, NULL, NULL); 48 0, 0, NULL);
49 if (!raw_inode_slab) 49 if (!raw_inode_slab)
50 goto err; 50 goto err;
51 51
52 tmp_dnode_info_slab = kmem_cache_create("jffs2_tmp_dnode", 52 tmp_dnode_info_slab = kmem_cache_create("jffs2_tmp_dnode",
53 sizeof(struct jffs2_tmp_dnode_info), 53 sizeof(struct jffs2_tmp_dnode_info),
54 0, 0, NULL, NULL); 54 0, 0, NULL);
55 if (!tmp_dnode_info_slab) 55 if (!tmp_dnode_info_slab)
56 goto err; 56 goto err;
57 57
58 raw_node_ref_slab = kmem_cache_create("jffs2_refblock", 58 raw_node_ref_slab = kmem_cache_create("jffs2_refblock",
59 sizeof(struct jffs2_raw_node_ref) * (REFS_PER_BLOCK + 1), 59 sizeof(struct jffs2_raw_node_ref) * (REFS_PER_BLOCK + 1),
60 0, 0, NULL, NULL); 60 0, 0, NULL);
61 if (!raw_node_ref_slab) 61 if (!raw_node_ref_slab)
62 goto err; 62 goto err;
63 63
64 node_frag_slab = kmem_cache_create("jffs2_node_frag", 64 node_frag_slab = kmem_cache_create("jffs2_node_frag",
65 sizeof(struct jffs2_node_frag), 65 sizeof(struct jffs2_node_frag),
66 0, 0, NULL, NULL); 66 0, 0, NULL);
67 if (!node_frag_slab) 67 if (!node_frag_slab)
68 goto err; 68 goto err;
69 69
70 inode_cache_slab = kmem_cache_create("jffs2_inode_cache", 70 inode_cache_slab = kmem_cache_create("jffs2_inode_cache",
71 sizeof(struct jffs2_inode_cache), 71 sizeof(struct jffs2_inode_cache),
72 0, 0, NULL, NULL); 72 0, 0, NULL);
73 if (!inode_cache_slab) 73 if (!inode_cache_slab)
74 goto err; 74 goto err;
75 75
76#ifdef CONFIG_JFFS2_FS_XATTR 76#ifdef CONFIG_JFFS2_FS_XATTR
77 xattr_datum_cache = kmem_cache_create("jffs2_xattr_datum", 77 xattr_datum_cache = kmem_cache_create("jffs2_xattr_datum",
78 sizeof(struct jffs2_xattr_datum), 78 sizeof(struct jffs2_xattr_datum),
79 0, 0, NULL, NULL); 79 0, 0, NULL);
80 if (!xattr_datum_cache) 80 if (!xattr_datum_cache)
81 goto err; 81 goto err;
82 82
83 xattr_ref_cache = kmem_cache_create("jffs2_xattr_ref", 83 xattr_ref_cache = kmem_cache_create("jffs2_xattr_ref",
84 sizeof(struct jffs2_xattr_ref), 84 sizeof(struct jffs2_xattr_ref),
85 0, 0, NULL, NULL); 85 0, 0, NULL);
86 if (!xattr_ref_cache) 86 if (!xattr_ref_cache)
87 goto err; 87 goto err;
88#endif 88#endif
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
index e220d3bd610d..be2b70c2ec16 100644
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -192,7 +192,7 @@ static int __init init_jffs2_fs(void)
192 sizeof(struct jffs2_inode_info), 192 sizeof(struct jffs2_inode_info),
193 0, (SLAB_RECLAIM_ACCOUNT| 193 0, (SLAB_RECLAIM_ACCOUNT|
194 SLAB_MEM_SPREAD), 194 SLAB_MEM_SPREAD),
195 jffs2_i_init_once, NULL); 195 jffs2_i_init_once);
196 if (!jffs2_inode_cachep) { 196 if (!jffs2_inode_cachep) {
197 printk(KERN_ERR "JFFS2 error: Failed to initialise inode cache\n"); 197 printk(KERN_ERR "JFFS2 error: Failed to initialise inode cache\n");
198 return -ENOMEM; 198 return -ENOMEM;
diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
index 77c7f1129dde..62e96be02acf 100644
--- a/fs/jfs/jfs_metapage.c
+++ b/fs/jfs/jfs_metapage.c
@@ -213,7 +213,7 @@ int __init metapage_init(void)
213 * Allocate the metapage structures 213 * Allocate the metapage structures
214 */ 214 */
215 metapage_cache = kmem_cache_create("jfs_mp", sizeof(struct metapage), 215 metapage_cache = kmem_cache_create("jfs_mp", sizeof(struct metapage),
216 0, 0, init_once, NULL); 216 0, 0, init_once);
217 if (metapage_cache == NULL) 217 if (metapage_cache == NULL)
218 return -ENOMEM; 218 return -ENOMEM;
219 219
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 929fceca7999..4b372f550652 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -776,7 +776,7 @@ static int __init init_jfs_fs(void)
776 jfs_inode_cachep = 776 jfs_inode_cachep =
777 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0, 777 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
778 SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, 778 SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
779 init_once, NULL); 779 init_once);
780 if (jfs_inode_cachep == NULL) 780 if (jfs_inode_cachep == NULL)
781 return -ENOMEM; 781 return -ENOMEM;
782 782
diff --git a/fs/locks.c b/fs/locks.c
index 4f2d749ac624..310510637247 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -2276,7 +2276,7 @@ static int __init filelock_init(void)
2276{ 2276{
2277 filelock_cache = kmem_cache_create("file_lock_cache", 2277 filelock_cache = kmem_cache_create("file_lock_cache",
2278 sizeof(struct file_lock), 0, SLAB_PANIC, 2278 sizeof(struct file_lock), 0, SLAB_PANIC,
2279 init_once, NULL); 2279 init_once);
2280 return 0; 2280 return 0;
2281} 2281}
2282 2282
diff --git a/fs/mbcache.c b/fs/mbcache.c
index fbb1d02f8791..1046cbefbfbf 100644
--- a/fs/mbcache.c
+++ b/fs/mbcache.c
@@ -292,7 +292,7 @@ mb_cache_create(const char *name, struct mb_cache_op *cache_op,
292 INIT_LIST_HEAD(&cache->c_indexes_hash[m][n]); 292 INIT_LIST_HEAD(&cache->c_indexes_hash[m][n]);
293 } 293 }
294 cache->c_entry_cache = kmem_cache_create(name, entry_size, 0, 294 cache->c_entry_cache = kmem_cache_create(name, entry_size, 0,
295 SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, NULL, NULL); 295 SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, NULL);
296 if (!cache->c_entry_cache) 296 if (!cache->c_entry_cache)
297 goto fail; 297 goto fail;
298 298
diff --git a/fs/minix/inode.c b/fs/minix/inode.c
index be4044614ac8..43668d7d668f 100644
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
@@ -75,14 +75,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
75 75
76 inode_init_once(&ei->vfs_inode); 76 inode_init_once(&ei->vfs_inode);
77} 77}
78 78
79static int init_inodecache(void) 79static 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| 83 0, (SLAB_RECLAIM_ACCOUNT|
84 SLAB_MEM_SPREAD), 84 SLAB_MEM_SPREAD),
85 init_once, NULL); 85 init_once);
86 if (minix_inode_cachep == NULL) 86 if (minix_inode_cachep == NULL)
87 return -ENOMEM; 87 return -ENOMEM;
88 return 0; 88 return 0;
diff --git a/fs/namespace.c b/fs/namespace.c
index 4198003d7e18..ddbda13c2d31 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1801,7 +1801,7 @@ void __init mnt_init(unsigned long mempages)
1801 init_rwsem(&namespace_sem); 1801 init_rwsem(&namespace_sem);
1802 1802
1803 mnt_cache = kmem_cache_create("mnt_cache", sizeof(struct vfsmount), 1803 mnt_cache = kmem_cache_create("mnt_cache", sizeof(struct vfsmount),
1804 0, SLAB_HWCACHE_ALIGN | SLAB_PANIC, NULL, NULL); 1804 0, SLAB_HWCACHE_ALIGN | SLAB_PANIC, NULL);
1805 1805
1806 mount_hashtable = (struct list_head *)__get_free_page(GFP_ATOMIC); 1806 mount_hashtable = (struct list_head *)__get_free_page(GFP_ATOMIC);
1807 1807
diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c
index cf06eb9f050e..7f8536dbdedc 100644
--- a/fs/ncpfs/inode.c
+++ b/fs/ncpfs/inode.c
@@ -63,14 +63,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
63 mutex_init(&ei->open_mutex); 63 mutex_init(&ei->open_mutex);
64 inode_init_once(&ei->vfs_inode); 64 inode_init_once(&ei->vfs_inode);
65} 65}
66 66
67static int init_inodecache(void) 67static int init_inodecache(void)
68{ 68{
69 ncp_inode_cachep = kmem_cache_create("ncp_inode_cache", 69 ncp_inode_cachep = kmem_cache_create("ncp_inode_cache",
70 sizeof(struct ncp_inode_info), 70 sizeof(struct ncp_inode_info),
71 0, (SLAB_RECLAIM_ACCOUNT| 71 0, (SLAB_RECLAIM_ACCOUNT|
72 SLAB_MEM_SPREAD), 72 SLAB_MEM_SPREAD),
73 init_once, NULL); 73 init_once);
74 if (ncp_inode_cachep == NULL) 74 if (ncp_inode_cachep == NULL)
75 return -ENOMEM; 75 return -ENOMEM;
76 return 0; 76 return 0;
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index a5c82b6f3b45..fcf4d384610e 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -875,7 +875,7 @@ int __init nfs_init_directcache(void)
875 sizeof(struct nfs_direct_req), 875 sizeof(struct nfs_direct_req),
876 0, (SLAB_RECLAIM_ACCOUNT| 876 0, (SLAB_RECLAIM_ACCOUNT|
877 SLAB_MEM_SPREAD), 877 SLAB_MEM_SPREAD),
878 NULL, NULL); 878 NULL);
879 if (nfs_direct_cachep == NULL) 879 if (nfs_direct_cachep == NULL)
880 return -ENOMEM; 880 return -ENOMEM;
881 881
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 3d9fccf4ef93..bca6cdcb9f0d 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -1165,14 +1165,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
1165 nfsi->npages = 0; 1165 nfsi->npages = 0;
1166 nfs4_init_once(nfsi); 1166 nfs4_init_once(nfsi);
1167} 1167}
1168 1168
1169static int __init nfs_init_inodecache(void) 1169static int __init nfs_init_inodecache(void)
1170{ 1170{
1171 nfs_inode_cachep = kmem_cache_create("nfs_inode_cache", 1171 nfs_inode_cachep = kmem_cache_create("nfs_inode_cache",
1172 sizeof(struct nfs_inode), 1172 sizeof(struct nfs_inode),
1173 0, (SLAB_RECLAIM_ACCOUNT| 1173 0, (SLAB_RECLAIM_ACCOUNT|
1174 SLAB_MEM_SPREAD), 1174 SLAB_MEM_SPREAD),
1175 init_once, NULL); 1175 init_once);
1176 if (nfs_inode_cachep == NULL) 1176 if (nfs_inode_cachep == NULL)
1177 return -ENOMEM; 1177 return -ENOMEM;
1178 1178
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index f56dae5216f4..345bb9b4765b 100644
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -442,7 +442,7 @@ int __init nfs_init_nfspagecache(void)
442 nfs_page_cachep = kmem_cache_create("nfs_page", 442 nfs_page_cachep = kmem_cache_create("nfs_page",
443 sizeof(struct nfs_page), 443 sizeof(struct nfs_page),
444 0, SLAB_HWCACHE_ALIGN, 444 0, SLAB_HWCACHE_ALIGN,
445 NULL, NULL); 445 NULL);
446 if (nfs_page_cachep == NULL) 446 if (nfs_page_cachep == NULL)
447 return -ENOMEM; 447 return -ENOMEM;
448 448
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 6ae2e58ed05a..19e05633f4e3 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -598,7 +598,7 @@ int __init nfs_init_readpagecache(void)
598 nfs_rdata_cachep = kmem_cache_create("nfs_read_data", 598 nfs_rdata_cachep = kmem_cache_create("nfs_read_data",
599 sizeof(struct nfs_read_data), 599 sizeof(struct nfs_read_data),
600 0, SLAB_HWCACHE_ALIGN, 600 0, SLAB_HWCACHE_ALIGN,
601 NULL, NULL); 601 NULL);
602 if (nfs_rdata_cachep == NULL) 602 if (nfs_rdata_cachep == NULL)
603 return -ENOMEM; 603 return -ENOMEM;
604 604
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 73ac992ece85..ef97e0c0f5b1 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1467,7 +1467,7 @@ int __init nfs_init_writepagecache(void)
1467 nfs_wdata_cachep = kmem_cache_create("nfs_write_data", 1467 nfs_wdata_cachep = kmem_cache_create("nfs_write_data",
1468 sizeof(struct nfs_write_data), 1468 sizeof(struct nfs_write_data),
1469 0, SLAB_HWCACHE_ALIGN, 1469 0, SLAB_HWCACHE_ALIGN,
1470 NULL, NULL); 1470 NULL);
1471 if (nfs_wdata_cachep == NULL) 1471 if (nfs_wdata_cachep == NULL)
1472 return -ENOMEM; 1472 return -ENOMEM;
1473 1473
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 6284807bd37e..3f559700788f 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1032,19 +1032,19 @@ static int
1032nfsd4_init_slabs(void) 1032nfsd4_init_slabs(void)
1033{ 1033{
1034 stateowner_slab = kmem_cache_create("nfsd4_stateowners", 1034 stateowner_slab = kmem_cache_create("nfsd4_stateowners",
1035 sizeof(struct nfs4_stateowner), 0, 0, NULL, NULL); 1035 sizeof(struct nfs4_stateowner), 0, 0, NULL);
1036 if (stateowner_slab == NULL) 1036 if (stateowner_slab == NULL)
1037 goto out_nomem; 1037 goto out_nomem;
1038 file_slab = kmem_cache_create("nfsd4_files", 1038 file_slab = kmem_cache_create("nfsd4_files",
1039 sizeof(struct nfs4_file), 0, 0, NULL, NULL); 1039 sizeof(struct nfs4_file), 0, 0, NULL);
1040 if (file_slab == NULL) 1040 if (file_slab == NULL)
1041 goto out_nomem; 1041 goto out_nomem;
1042 stateid_slab = kmem_cache_create("nfsd4_stateids", 1042 stateid_slab = kmem_cache_create("nfsd4_stateids",
1043 sizeof(struct nfs4_stateid), 0, 0, NULL, NULL); 1043 sizeof(struct nfs4_stateid), 0, 0, NULL);
1044 if (stateid_slab == NULL) 1044 if (stateid_slab == NULL)
1045 goto out_nomem; 1045 goto out_nomem;
1046 deleg_slab = kmem_cache_create("nfsd4_delegations", 1046 deleg_slab = kmem_cache_create("nfsd4_delegations",
1047 sizeof(struct nfs4_delegation), 0, 0, NULL, NULL); 1047 sizeof(struct nfs4_delegation), 0, 0, NULL);
1048 if (deleg_slab == NULL) 1048 if (deleg_slab == NULL)
1049 goto out_nomem; 1049 goto out_nomem;
1050 return 0; 1050 return 0;
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
index 4566b9182551..90c4e3a29706 100644
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
@@ -3143,7 +3143,7 @@ static int __init init_ntfs_fs(void)
3143 3143
3144 ntfs_index_ctx_cache = kmem_cache_create(ntfs_index_ctx_cache_name, 3144 ntfs_index_ctx_cache = kmem_cache_create(ntfs_index_ctx_cache_name,
3145 sizeof(ntfs_index_context), 0 /* offset */, 3145 sizeof(ntfs_index_context), 0 /* offset */,
3146 SLAB_HWCACHE_ALIGN, NULL /* ctor */, NULL /* dtor */); 3146 SLAB_HWCACHE_ALIGN, NULL /* ctor */);
3147 if (!ntfs_index_ctx_cache) { 3147 if (!ntfs_index_ctx_cache) {
3148 printk(KERN_CRIT "NTFS: Failed to create %s!\n", 3148 printk(KERN_CRIT "NTFS: Failed to create %s!\n",
3149 ntfs_index_ctx_cache_name); 3149 ntfs_index_ctx_cache_name);
@@ -3151,7 +3151,7 @@ static int __init init_ntfs_fs(void)
3151 } 3151 }
3152 ntfs_attr_ctx_cache = kmem_cache_create(ntfs_attr_ctx_cache_name, 3152 ntfs_attr_ctx_cache = kmem_cache_create(ntfs_attr_ctx_cache_name,
3153 sizeof(ntfs_attr_search_ctx), 0 /* offset */, 3153 sizeof(ntfs_attr_search_ctx), 0 /* offset */,
3154 SLAB_HWCACHE_ALIGN, NULL /* ctor */, NULL /* dtor */); 3154 SLAB_HWCACHE_ALIGN, NULL /* ctor */);
3155 if (!ntfs_attr_ctx_cache) { 3155 if (!ntfs_attr_ctx_cache) {
3156 printk(KERN_CRIT "NTFS: Failed to create %s!\n", 3156 printk(KERN_CRIT "NTFS: Failed to create %s!\n",
3157 ntfs_attr_ctx_cache_name); 3157 ntfs_attr_ctx_cache_name);
@@ -3160,7 +3160,7 @@ static int __init init_ntfs_fs(void)
3160 3160
3161 ntfs_name_cache = kmem_cache_create(ntfs_name_cache_name, 3161 ntfs_name_cache = kmem_cache_create(ntfs_name_cache_name,
3162 (NTFS_MAX_NAME_LEN+1) * sizeof(ntfschar), 0, 3162 (NTFS_MAX_NAME_LEN+1) * sizeof(ntfschar), 0,
3163 SLAB_HWCACHE_ALIGN, NULL, NULL); 3163 SLAB_HWCACHE_ALIGN, NULL);
3164 if (!ntfs_name_cache) { 3164 if (!ntfs_name_cache) {
3165 printk(KERN_CRIT "NTFS: Failed to create %s!\n", 3165 printk(KERN_CRIT "NTFS: Failed to create %s!\n",
3166 ntfs_name_cache_name); 3166 ntfs_name_cache_name);
@@ -3169,7 +3169,7 @@ static int __init init_ntfs_fs(void)
3169 3169
3170 ntfs_inode_cache = kmem_cache_create(ntfs_inode_cache_name, 3170 ntfs_inode_cache = kmem_cache_create(ntfs_inode_cache_name,
3171 sizeof(ntfs_inode), 0, 3171 sizeof(ntfs_inode), 0,
3172 SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, NULL, NULL); 3172 SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, NULL);
3173 if (!ntfs_inode_cache) { 3173 if (!ntfs_inode_cache) {
3174 printk(KERN_CRIT "NTFS: Failed to create %s!\n", 3174 printk(KERN_CRIT "NTFS: Failed to create %s!\n",
3175 ntfs_inode_cache_name); 3175 ntfs_inode_cache_name);
@@ -3179,7 +3179,7 @@ static int __init init_ntfs_fs(void)
3179 ntfs_big_inode_cache = kmem_cache_create(ntfs_big_inode_cache_name, 3179 ntfs_big_inode_cache = kmem_cache_create(ntfs_big_inode_cache_name,
3180 sizeof(big_ntfs_inode), 0, 3180 sizeof(big_ntfs_inode), 0,
3181 SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, 3181 SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
3182 ntfs_big_inode_init_once, NULL); 3182 ntfs_big_inode_init_once);
3183 if (!ntfs_big_inode_cache) { 3183 if (!ntfs_big_inode_cache) {
3184 printk(KERN_CRIT "NTFS: Failed to create %s!\n", 3184 printk(KERN_CRIT "NTFS: Failed to create %s!\n",
3185 ntfs_big_inode_cache_name); 3185 ntfs_big_inode_cache_name);
diff --git a/fs/ocfs2/dlm/dlmfs.c b/fs/ocfs2/dlm/dlmfs.c
index fd8cb1badc9b..7418dc83de1c 100644
--- a/fs/ocfs2/dlm/dlmfs.c
+++ b/fs/ocfs2/dlm/dlmfs.c
@@ -592,7 +592,7 @@ static int __init init_dlmfs_fs(void)
592 sizeof(struct dlmfs_inode_private), 592 sizeof(struct dlmfs_inode_private),
593 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| 593 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
594 SLAB_MEM_SPREAD), 594 SLAB_MEM_SPREAD),
595 dlmfs_init_once, NULL); 595 dlmfs_init_once);
596 if (!dlmfs_inode_cache) 596 if (!dlmfs_inode_cache)
597 return -ENOMEM; 597 return -ENOMEM;
598 cleanup_inode = 1; 598 cleanup_inode = 1;
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 65b2b9b92688..62e4a7daa286 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -510,7 +510,7 @@ int dlm_init_mle_cache(void)
510 dlm_mle_cache = kmem_cache_create("dlm_mle_cache", 510 dlm_mle_cache = kmem_cache_create("dlm_mle_cache",
511 sizeof(struct dlm_master_list_entry), 511 sizeof(struct dlm_master_list_entry),
512 0, SLAB_HWCACHE_ALIGN, 512 0, SLAB_HWCACHE_ALIGN,
513 NULL, NULL); 513 NULL);
514 if (dlm_mle_cache == NULL) 514 if (dlm_mle_cache == NULL)
515 return -ENOMEM; 515 return -ENOMEM;
516 return 0; 516 return 0;
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 3a5a1ed09ac9..200c7d4790dc 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -984,7 +984,7 @@ static int ocfs2_initialize_mem_caches(void)
984 0, 984 0,
985 (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| 985 (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
986 SLAB_MEM_SPREAD), 986 SLAB_MEM_SPREAD),
987 ocfs2_inode_init_once, NULL); 987 ocfs2_inode_init_once);
988 if (!ocfs2_inode_cachep) 988 if (!ocfs2_inode_cachep)
989 return -ENOMEM; 989 return -ENOMEM;
990 990
diff --git a/fs/ocfs2/uptodate.c b/fs/ocfs2/uptodate.c
index 39814b900fc0..4da8851f2b23 100644
--- a/fs/ocfs2/uptodate.c
+++ b/fs/ocfs2/uptodate.c
@@ -548,7 +548,7 @@ int __init init_ocfs2_uptodate_cache(void)
548{ 548{
549 ocfs2_uptodate_cachep = kmem_cache_create("ocfs2_uptodate", 549 ocfs2_uptodate_cachep = kmem_cache_create("ocfs2_uptodate",
550 sizeof(struct ocfs2_meta_cache_item), 550 sizeof(struct ocfs2_meta_cache_item),
551 0, SLAB_HWCACHE_ALIGN, NULL, NULL); 551 0, SLAB_HWCACHE_ALIGN, NULL);
552 if (!ocfs2_uptodate_cachep) 552 if (!ocfs2_uptodate_cachep)
553 return -ENOMEM; 553 return -ENOMEM;
554 554
diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c
index e62397341c36..dd86be2aa6c9 100644
--- a/fs/openpromfs/inode.c
+++ b/fs/openpromfs/inode.c
@@ -431,7 +431,7 @@ static int __init init_openprom_fs(void)
431 0, 431 0,
432 (SLAB_RECLAIM_ACCOUNT | 432 (SLAB_RECLAIM_ACCOUNT |
433 SLAB_MEM_SPREAD), 433 SLAB_MEM_SPREAD),
434 op_inode_init_once, NULL); 434 op_inode_init_once);
435 if (!op_inode_cachep) 435 if (!op_inode_cachep)
436 return -ENOMEM; 436 return -ENOMEM;
437 437
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index dd28e86ab422..94e2c1adf184 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -112,14 +112,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
112 112
113 inode_init_once(&ei->vfs_inode); 113 inode_init_once(&ei->vfs_inode);
114} 114}
115 115
116int __init proc_init_inodecache(void) 116int __init proc_init_inodecache(void)
117{ 117{
118 proc_inode_cachep = kmem_cache_create("proc_inode_cache", 118 proc_inode_cachep = kmem_cache_create("proc_inode_cache",
119 sizeof(struct proc_inode), 119 sizeof(struct proc_inode),
120 0, (SLAB_RECLAIM_ACCOUNT| 120 0, (SLAB_RECLAIM_ACCOUNT|
121 SLAB_MEM_SPREAD), 121 SLAB_MEM_SPREAD),
122 init_once, NULL); 122 init_once);
123 if (proc_inode_cachep == NULL) 123 if (proc_inode_cachep == NULL)
124 return -ENOMEM; 124 return -ENOMEM;
125 return 0; 125 return 0;
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c
index 8d256eb11813..1bc8d873a9e1 100644
--- a/fs/qnx4/inode.c
+++ b/fs/qnx4/inode.c
@@ -545,7 +545,7 @@ static int init_inodecache(void)
545 sizeof(struct qnx4_inode_info), 545 sizeof(struct qnx4_inode_info),
546 0, (SLAB_RECLAIM_ACCOUNT| 546 0, (SLAB_RECLAIM_ACCOUNT|
547 SLAB_MEM_SPREAD), 547 SLAB_MEM_SPREAD),
548 init_once, NULL); 548 init_once);
549 if (qnx4_inode_cachep == NULL) 549 if (qnx4_inode_cachep == NULL)
550 return -ENOMEM; 550 return -ENOMEM;
551 return 0; 551 return 0;
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 5a93cfe1a032..5b68dd3f191a 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -527,7 +527,7 @@ static int init_inodecache(void)
527 reiserfs_inode_info), 527 reiserfs_inode_info),
528 0, (SLAB_RECLAIM_ACCOUNT| 528 0, (SLAB_RECLAIM_ACCOUNT|
529 SLAB_MEM_SPREAD), 529 SLAB_MEM_SPREAD),
530 init_once, NULL); 530 init_once);
531 if (reiserfs_inode_cachep == NULL) 531 if (reiserfs_inode_cachep == NULL)
532 return -ENOMEM; 532 return -ENOMEM;
533 return 0; 533 return 0;
diff --git a/fs/romfs/inode.c b/fs/romfs/inode.c
index 2284e03342c6..dae7945f90e4 100644
--- a/fs/romfs/inode.c
+++ b/fs/romfs/inode.c
@@ -572,14 +572,14 @@ static void init_once(void *foo, struct kmem_cache *cachep, unsigned long flags)
572 572
573 inode_init_once(&ei->vfs_inode); 573 inode_init_once(&ei->vfs_inode);
574} 574}
575 575
576static int init_inodecache(void) 576static int init_inodecache(void)
577{ 577{
578 romfs_inode_cachep = kmem_cache_create("romfs_inode_cache", 578 romfs_inode_cachep = kmem_cache_create("romfs_inode_cache",
579 sizeof(struct romfs_inode_info), 579 sizeof(struct romfs_inode_info),
580 0, (SLAB_RECLAIM_ACCOUNT| 580 0, (SLAB_RECLAIM_ACCOUNT|
581 SLAB_MEM_SPREAD), 581 SLAB_MEM_SPREAD),
582 init_once, NULL); 582 init_once);
583 if (romfs_inode_cachep == NULL) 583 if (romfs_inode_cachep == NULL)
584 return -ENOMEM; 584 return -ENOMEM;
585 return 0; 585 return 0;
diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c
index 6724a6cf01ff..73d1450a95d4 100644
--- a/fs/smbfs/inode.c
+++ b/fs/smbfs/inode.c
@@ -73,14 +73,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
73 73
74 inode_init_once(&ei->vfs_inode); 74 inode_init_once(&ei->vfs_inode);
75} 75}
76 76
77static int init_inodecache(void) 77static int init_inodecache(void)
78{ 78{
79 smb_inode_cachep = kmem_cache_create("smb_inode_cache", 79 smb_inode_cachep = kmem_cache_create("smb_inode_cache",
80 sizeof(struct smb_inode_info), 80 sizeof(struct smb_inode_info),
81 0, (SLAB_RECLAIM_ACCOUNT| 81 0, (SLAB_RECLAIM_ACCOUNT|
82 SLAB_MEM_SPREAD), 82 SLAB_MEM_SPREAD),
83 init_once, NULL); 83 init_once);
84 if (smb_inode_cachep == NULL) 84 if (smb_inode_cachep == NULL)
85 return -ENOMEM; 85 return -ENOMEM;
86 return 0; 86 return 0;
diff --git a/fs/smbfs/request.c b/fs/smbfs/request.c
index 3f54a0f80fae..ca4b2d59c0ca 100644
--- a/fs/smbfs/request.c
+++ b/fs/smbfs/request.c
@@ -40,7 +40,7 @@ int smb_init_request_cache(void)
40 req_cachep = kmem_cache_create("smb_request", 40 req_cachep = kmem_cache_create("smb_request",
41 sizeof(struct smb_request), 0, 41 sizeof(struct smb_request), 0,
42 SMB_SLAB_DEBUG | SLAB_HWCACHE_ALIGN, 42 SMB_SLAB_DEBUG | SLAB_HWCACHE_ALIGN,
43 NULL, NULL); 43 NULL);
44 if (req_cachep == NULL) 44 if (req_cachep == NULL)
45 return -ENOMEM; 45 return -ENOMEM;
46 46
diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c
index 60714d075c2f..fbc7b65fe262 100644
--- a/fs/sysfs/mount.c
+++ b/fs/sysfs/mount.c
@@ -86,7 +86,7 @@ int __init sysfs_init(void)
86 86
87 sysfs_dir_cachep = kmem_cache_create("sysfs_dir_cache", 87 sysfs_dir_cachep = kmem_cache_create("sysfs_dir_cache",
88 sizeof(struct sysfs_dirent), 88 sizeof(struct sysfs_dirent),
89 0, 0, NULL, NULL); 89 0, 0, NULL);
90 if (!sysfs_dir_cachep) 90 if (!sysfs_dir_cachep)
91 goto out; 91 goto out;
92 92
diff --git a/fs/sysv/inode.c b/fs/sysv/inode.c
index 564411693394..7c4e5d302abb 100644
--- a/fs/sysv/inode.c
+++ b/fs/sysv/inode.c
@@ -342,7 +342,7 @@ int __init sysv_init_icache(void)
342 sysv_inode_cachep = kmem_cache_create("sysv_inode_cache", 342 sysv_inode_cachep = kmem_cache_create("sysv_inode_cache",
343 sizeof(struct sysv_inode_info), 0, 343 sizeof(struct sysv_inode_info), 0,
344 SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, 344 SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
345 init_once, NULL); 345 init_once);
346 if (!sysv_inode_cachep) 346 if (!sysv_inode_cachep)
347 return -ENOMEM; 347 return -ENOMEM;
348 return 0; 348 return 0;
diff --git a/fs/udf/super.c b/fs/udf/super.c
index 911387aa1810..72097ee6b752 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -149,7 +149,7 @@ static int init_inodecache(void)
149 sizeof(struct udf_inode_info), 149 sizeof(struct udf_inode_info),
150 0, (SLAB_RECLAIM_ACCOUNT | 150 0, (SLAB_RECLAIM_ACCOUNT |
151 SLAB_MEM_SPREAD), 151 SLAB_MEM_SPREAD),
152 init_once, NULL); 152 init_once);
153 if (udf_inode_cachep == NULL) 153 if (udf_inode_cachep == NULL)
154 return -ENOMEM; 154 return -ENOMEM;
155 return 0; 155 return 0;
diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index 2b3011689e89..73402c5eeb8a 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -1240,14 +1240,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
1240 1240
1241 inode_init_once(&ei->vfs_inode); 1241 inode_init_once(&ei->vfs_inode);
1242} 1242}
1243 1243
1244static int init_inodecache(void) 1244static int init_inodecache(void)
1245{ 1245{
1246 ufs_inode_cachep = kmem_cache_create("ufs_inode_cache", 1246 ufs_inode_cachep = kmem_cache_create("ufs_inode_cache",
1247 sizeof(struct ufs_inode_info), 1247 sizeof(struct ufs_inode_info),
1248 0, (SLAB_RECLAIM_ACCOUNT| 1248 0, (SLAB_RECLAIM_ACCOUNT|
1249 SLAB_MEM_SPREAD), 1249 SLAB_MEM_SPREAD),
1250 init_once, NULL); 1250 init_once);
1251 if (ufs_inode_cachep == NULL) 1251 if (ufs_inode_cachep == NULL)
1252 return -ENOMEM; 1252 return -ENOMEM;
1253 return 0; 1253 return 0;
diff --git a/fs/xfs/linux-2.6/kmem.h b/fs/xfs/linux-2.6/kmem.h
index 4b6470cf87f0..b4acc7f3c374 100644
--- a/fs/xfs/linux-2.6/kmem.h
+++ b/fs/xfs/linux-2.6/kmem.h
@@ -74,14 +74,14 @@ extern void kmem_free(void *, size_t);
74static inline kmem_zone_t * 74static inline kmem_zone_t *
75kmem_zone_init(int size, char *zone_name) 75kmem_zone_init(int size, char *zone_name)
76{ 76{
77 return kmem_cache_create(zone_name, size, 0, 0, NULL, NULL); 77 return kmem_cache_create(zone_name, size, 0, 0, NULL);
78} 78}
79 79
80static inline kmem_zone_t * 80static inline kmem_zone_t *
81kmem_zone_init_flags(int size, char *zone_name, unsigned long flags, 81kmem_zone_init_flags(int size, char *zone_name, unsigned long flags,
82 void (*construct)(void *, kmem_zone_t *, unsigned long)) 82 void (*construct)(void *, kmem_zone_t *, unsigned long))
83{ 83{
84 return kmem_cache_create(zone_name, size, 0, flags, construct, NULL); 84 return kmem_cache_create(zone_name, size, 0, flags, construct);
85} 85}
86 86
87static inline void 87static inline void
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-07 14:12:15 -0500