summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorBernd Schubert <bernd.schubert@itwm.fraunhofer.de>2012-09-26 21:24:57 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-13 05:38:49 +0900
commit7061315f57c1dfa81d3d9b2f0efb50ce2b6f3371 (patch)
tree7fbacbab3f3523d8de7e8f1d74e5be2e5d46b0b4 /fs
parenta4bf81c2bf891cbd46d6a69ba15dd7d4350b62f3 (diff)
downloadlinux-3.10-7061315f57c1dfa81d3d9b2f0efb50ce2b6f3371.tar.gz
linux-3.10-7061315f57c1dfa81d3d9b2f0efb50ce2b6f3371.tar.bz2
linux-3.10-7061315f57c1dfa81d3d9b2f0efb50ce2b6f3371.zip
ext4: always set i_op in ext4_mknod()
commit 6a08f447facb4f9e29fcc30fb68060bb5a0d21c2 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-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 0a94cbbe882..ac769399b14 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1801,9 +1801,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);