summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernd Schubert <bernd.schubert@itwm.fraunhofer.de>2012-09-26 21:24:57 -0400
committerTheodore Ts'o <tytso@mit.edu>2012-09-26 21:24:57 -0400
commit6a08f447facb4f9e29fcc30fb68060bb5a0d21c2 (patch)
tree45bbcf11848b9d8743d4284f708842cf651414e3
parent63fedaf1c2dd546da22ff5b4ae06e9b4efba5146 (diff)
downloadblackbird-op-linux-6a08f447facb4f9e29fcc30fb68060bb5a0d21c2.tar.gz
blackbird-op-linux-6a08f447facb4f9e29fcc30fb68060bb5a0d21c2.zip
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
-rw-r--r--fs/ext4/namei.c2
1 files changed, 0 insertions, 2 deletions
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);
OpenPOWER on IntegriCloud