aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4
diff options
context:
space:
mode:
authorBernd Schubert <bernd.schubert@itwm.fraunhofer.de>2012-09-26 21:24:57 -0400
committerBen Hutchings <ben@decadent.org.uk>2012-10-17 03:49:03 +0100
commit9881fcc8b68753201ab8f84041ec70beac6df2f6 (patch)
tree8eddc5750523645cd23a0a02ca4dcc29c47af58c /fs/ext4
parent4ac206a50c319f692aab900408f949b04f8deab7 (diff)
downloadkernel_samsung_smdk4412-9881fcc8b68753201ab8f84041ec70beac6df2f6.zip
kernel_samsung_smdk4412-9881fcc8b68753201ab8f84041ec70beac6df2f6.tar.gz
kernel_samsung_smdk4412-9881fcc8b68753201ab8f84041ec70beac6df2f6.tar.bz2
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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs/ext4')
-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 4dd0890..88f97e5 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);