ext4: always set i_op in ext4_mknod()
authorBernd Schubert <bernd.schubert@itwm.fraunhofer.de>
Thu, 27 Sep 2012 01:24:57 +0000 (21:24 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 27 Sep 2012 01:24:57 +0000 (21:24 -0400)
ext4_special_inode_operations have their own ifdef CONFIG_EXT4_FS_XATTR
to mask those methods. And ext4_iget also always sets it, so there is
an inconsistency.

Signed-off-by: Bernd Schubert <bernd.schubert@itwm.fraunhofer.de>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@vger.kernel.org
fs/ext4/namei.c

index 8f4bda7..bd87b7a 100644 (file)
@@ -2156,9 +2156,7 @@ retry:
        err = PTR_ERR(inode);
        if (!IS_ERR(inode)) {
                init_special_inode(inode, inode->i_mode, rdev);
-#ifdef CONFIG_EXT4_FS_XATTR
                inode->i_op = &ext4_special_inode_operations;
-#endif
                err = ext4_add_nondir(handle, dentry, inode);
        }
        ext4_journal_stop(handle);