56 files changed, 178 insertions, 277 deletions

diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index a93f328a7317..7150730e2ff1 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -71,9 +71,7 @@ spufs_init_once(void *p, struct kmem_cache * cachep, unsigned long flags)
 {
         struct spufs_inode_info *ei = p;
 
-        if (flags & SLAB_CTOR_CONSTRUCTOR) {
-                inode_init_once(&ei->vfs_inode);
-        }
+        inode_init_once(&ei->vfs_inode);
 }
 
 static struct inode *
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index 3dba5733ed1f..74002945b71b 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -940,9 +940,6 @@ static void ltree_entry_ctor(void *obj, struct kmem_cache *cache,
 {
         struct ltree_entry *le = obj;
 
-        if (flags & SLAB_CTOR_CONSTRUCTOR)
-                return;
-
         le->users = 0;
         init_rwsem(&le->mutex);
 }
diff --git a/fs/adfs/super.c b/fs/adfs/super.c
index 30c296508497..de2ed5ca3351 100644
--- a/fs/adfs/super.c
+++ b/fs/adfs/super.c
@@ -232,8 +232,7 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
 {
         struct adfs_inode_info *ei = (struct adfs_inode_info *) foo;
 
-        if (flags & SLAB_CTOR_CONSTRUCTOR)
-                inode_init_once(&ei->vfs_inode);
+        inode_init_once(&ei->vfs_inode);
 }
  
 static int init_inodecache(void)
diff --git a/fs/affs/super.c b/fs/affs/super.c
index beff7d21e6e2..b800d451cd60 100644
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -87,11 +87,9 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
 {
         struct affs_inode_info *ei = (struct affs_inode_info *) foo;
 
-        if (flags & SLAB_CTOR_CONSTRUCTOR) {
-                init_MUTEX(&ei->i_link_lock);
-                init_MUTEX(&ei->i_ext_lock);
-                inode_init_once(&ei->vfs_inode);
-        }
+        init_MUTEX(&ei->i_link_lock);
+        init_MUTEX(&ei->i_ext_lock);
+        inode_init_once(&ei->vfs_inode);
 }
 
 static int init_inodecache(void)
diff --git a/fs/afs/super.c b/fs/afs/super.c
index 370cecc910db..8d47ad88a093 100644
--- a/fs/afs/super.c
+++ b/fs/afs/super.c
@@ -451,17 +451,15 @@ static void afs_i_init_once(void *_vnode, struct kmem_cache *cachep,
 {
         struct afs_vnode *vnode = _vnode;
 
-        if (flags & SLAB_CTOR_CONSTRUCTOR) {
-                memset(vnode, 0, sizeof(*vnode));
-                inode_init_once(&vnode->vfs_inode);
-                init_waitqueue_head(&vnode->update_waitq);
-                mutex_init(&vnode->permits_lock);
-                mutex_init(&vnode->validate_lock);
-                spin_lock_init(&vnode->writeback_lock);
-                spin_lock_init(&vnode->lock);
-                INIT_LIST_HEAD(&vnode->writebacks);
-                INIT_WORK(&vnode->cb_broken_work, afs_broken_callback_work);
-        }
+        memset(vnode, 0, sizeof(*vnode));
+        inode_init_once(&vnode->vfs_inode);
+        init_waitqueue_head(&vnode->update_waitq);
+        mutex_init(&vnode->permits_lock);
+        mutex_init(&vnode->validate_lock);
+        spin_lock_init(&vnode->writeback_lock);
+        spin_lock_init(&vnode->lock);
+        INIT_LIST_HEAD(&vnode->writebacks);
+        INIT_WORK(&vnode->cb_broken_work, afs_broken_callback_work);
 }
 
 /*
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
index fe96108a788d..a5c5171c2828 100644
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@ -292,10 +292,8 @@ befs_destroy_inode(struct inode *inode)
 static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flags)
 {
         struct befs_inode_info *bi = (struct befs_inode_info *) foo;
-        
-                if (flags & SLAB_CTOR_CONSTRUCTOR) {
-                        inode_init_once(&bi->vfs_inode);
-                }
+
+        inode_init_once(&bi->vfs_inode);
 }
 
 static void
diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c
index edc08d89aabc..58c7bd9f5301 100644
--- a/fs/bfs/inode.c
+++ b/fs/bfs/inode.c
@@ -248,8 +248,7 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
 {
         struct bfs_inode_info *bi = foo;
 
-        if (flags & SLAB_CTOR_CONSTRUCTOR)
-                inode_init_once(&bi->vfs_inode);
+        inode_init_once(&bi->vfs_inode);
 }
  
 static int init_inodecache(void)
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 742899240872..ea1480a16f51 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -458,17 +458,15 @@ static void init_once(void * foo, struct kmem_