From: Bernd Schubert <bernd.schubert@itwm.fraunhofer.de>
Date: Thu, 27 Sep 2012 01:24:57 +0000 (-0400)
Subject: ext4: always set i_op in ext4_mknod()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6a08f447facb4f9e29fcc30fb68060bb5a0d21c2;p=openwrt%2Fstaging%2Fblogic.git

ext4: always set i_op in ext4_mknod()

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
---

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 8f4bda75122e..bd87b7a66afb 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -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);