aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ncpfs/inode.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 21:38:13 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 21:38:13 -0400
commit9a79b2274186fade17134929d4f85b70d59a3840 (patch)
treed74e9ecc83ef617166445501b49087726595fb63 /fs/ncpfs/inode.c
parent75473c1d3930896bbabcc99bb58fafd53ef42473 (diff)
parent20c2df83d25c6a95affe6157a4c9cac4cf5ffaac (diff)
Merge branch 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: mm: Remove slab destructors from kmem_cache_create().
Diffstat (limited to 'fs/ncpfs/inode.c')
-rw-r--r--fs/ncpfs/inode.c4
1 files changed, 2 insertions, 2 deletions
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;