X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fsysv%2Finode.c;h=81ec6c548c07c0e34db7821cf72e8f0676f3d177;hb=197cd65accc6a274dabcd81f4811ba5d9a4856df;hp=3152d7415606711fa168b4e9f5f459d5c13f125c;hpb=f697b677620d04d8c77841745727de85f7e948b1;p=linux-2.6

diff --git a/fs/sysv/inode.c b/fs/sysv/inode.c
index 3152d74156..81ec6c548c 100644
--- a/fs/sysv/inode.c
+++ b/fs/sysv/inode.c
@@ -318,12 +318,11 @@ static void sysv_destroy_inode(struct inode *inode)
 	kmem_cache_free(sysv_inode_cachep, SYSV_I(inode));
 }
 
-static void init_once(void *p, struct kmem_cache *cachep, unsigned long flags)
+static void init_once(struct kmem_cache *cachep, void *p)
 {
 	struct sysv_inode_info *si = (struct sysv_inode_info *)p;
 
-	if (flags & SLAB_CTOR_CONSTRUCTOR)
-		inode_init_once(&si->vfs_inode);
+	inode_init_once(&si->vfs_inode);
 }
 
 const struct super_operations sysv_sops = {
@@ -343,7 +342,7 @@ int __init sysv_init_icache(void)
 	sysv_inode_cachep = kmem_cache_create("sysv_inode_cache",
 			sizeof(struct sysv_inode_info), 0,
 			SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
-			init_once, NULL);
+			init_once);
 	if (!sysv_inode_cachep)
 		return -ENOMEM;
 	return 0;