X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=fs%2Fncpfs%2Finode.c;h=e1cb70c643f8f81f599ad1da0c76cc9080aba332;hb=eebd2aa355692afaf9906f62118620f1a1c19dbb;hp=7285c94956c4988cbf1fd06b2a01bd3b0216cd4e;hpb=bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775;p=powerpc.git

diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c
index 7285c94956..e1cb70c643 100644
--- a/fs/ncpfs/inode.c
+++ b/fs/ncpfs/inode.c
@@ -56,24 +56,21 @@ static void ncp_destroy_inode(struct inode *inode)
 	kmem_cache_free(ncp_inode_cachep, NCP_FINFO(inode));
 }
 
-static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flags)
+static void init_once(struct kmem_cache *cachep, void *foo)
 {
 	struct ncp_inode_info *ei = (struct ncp_inode_info *) foo;
 
-	if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
-	    SLAB_CTOR_CONSTRUCTOR) {
-		mutex_init(&ei->open_mutex);
-		inode_init_once(&ei->vfs_inode);
-	}
+	mutex_init(&ei->open_mutex);
+	inode_init_once(&ei->vfs_inode);
 }
- 
+
 static int init_inodecache(void)
 {
 	ncp_inode_cachep = kmem_cache_create("ncp_inode_cache",
 					     sizeof(struct ncp_inode_info),
 					     0, (SLAB_RECLAIM_ACCOUNT|
 						SLAB_MEM_SPREAD),
-					     init_once, NULL);
+					     init_once);
 	if (ncp_inode_cachep == NULL)
 		return -ENOMEM;
 	return 0;