Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

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

diff --git a/fs/hfs/super.c b/fs/hfs/super.c
index 623f509f1d47cfcbbac098372180b93e99150904..4f1888f16cf0b061a3b802c8b7175f26ef66a9da 100644 (file)
--- a/fs/hfs/super.c
+++ b/fs/hfs/super.c
@@ -434,7 +434,7 @@ static void hfs_init_once(void *p, struct kmem_cache *cachep, unsigned long flag
 {
        struct hfs_inode_info *i = p;
 
-       if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) == SLAB_CTOR_CONSTRUCTOR)
+       if (flags & SLAB_CTOR_CONSTRUCTOR)
                inode_init_once(&i->vfs_inode);
 }