Pull thermal into release branch

[~andy/linux] / fs / adfs / super.c

diff --git a/fs/adfs/super.c b/fs/adfs/super.c
index 2e5f2c8371ee3839acf853d7b2f3d22a08a9fe0c..30c296508497d0d127f9d1742d520aceb142dee9 100644 (file)
--- 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_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
-           SLAB_CTOR_CONSTRUCTOR)
+       if (flags & SLAB_CTOR_CONSTRUCTOR)
                inode_init_once(&ei->vfs_inode);
 }