2 files changed, 18 insertions, 22 deletions

diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
index 6b3acb0b5781..43d4f69afbec 100644
--- a/fs/jfs/jfs_metapage.c
+++ b/fs/jfs/jfs_metapage.c
@@ -184,16 +184,14 @@ static void init_once(void *foo, struct kmem_cache *cachep, unsigned long flags)
 {
         struct metapage *mp = (struct metapage *)foo;
 
-        if (flags & SLAB_CTOR_CONSTRUCTOR) {
-                mp->lid = 0;
-                mp->lsn = 0;
-                mp->flag = 0;
-                mp->data = NULL;
-                mp->clsn = 0;
-                mp->log = NULL;
-                set_bit(META_free, &mp->flag);
-                init_waitqueue_head(&mp->wait);
-        }
+        mp->lid = 0;
+        mp->lsn = 0;
+        mp->flag = 0;
+        mp->data = NULL;
+        mp->clsn = 0;
+        mp->log = NULL;
+        set_bit(META_free, &mp->flag);
+        init_waitqueue_head(&mp->wait);
 }
 
 static inline struct metapage *alloc_metapage(gfp_t gfp_mask)
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index ea9dc3e65dcf..20e4ac1c79a3 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -752,20 +752,18 @@ static void init_once(void *foo, struct kmem_cache * cachep, unsigned long flags
 {
         struct jfs_inode_info *jfs_ip = (struct jfs_inode_info *) foo;
 
-        if (flags & SLAB_CTOR_CONSTRUCTOR) {
-                memset(jfs_ip, 0, sizeof(struct jfs_inode_info));
-                INIT_LIST_HEAD(&jfs_ip->anon_inode_list);
-                init_rwsem(&jfs_ip->rdwrlock);
-                mutex_init(&jfs_ip->commit_mutex);
-                init_rwsem(&jfs_ip->xattr_sem);
-                spin_lock_init(&jfs_ip->ag_lock);
-                jfs_ip->active_ag = -1;
+        memset(jfs_ip, 0, sizeof(struct jfs_inode_info));
+        INIT_LIST_HEAD(&jfs_ip->anon_inode_list);
+        init_rwsem(&jfs_ip->rdwrlock);
+        mutex_init(&jfs_ip->commit_mutex);
+        init_rwsem(&jfs_ip->xattr_sem);
+        spin_lock_init(&jfs_ip->ag_lock);
+        jfs_ip->active_ag = -1;
 #ifdef CONFIG_JFS_POSIX_ACL
-                jfs_ip->i_acl = JFS_ACL_NOT_CACHED;
-                jfs_ip->i_default_acl = JFS_ACL_NOT_CACHED;
+        jfs_ip->i_acl = JFS_ACL_NOT_CACHED;
+        jfs_ip->i_default_acl = JFS_ACL_NOT_CACHED;
 #endif
-                inode_init_once(&jfs_ip->vfs_inode);
-        }
+        inode_init_once(&jfs_ip->vfs_inode);
 }
 
 static int __init init_jfs_fs(void)