diff options
| author | Bernd Schubert <bernd.schubert@itwm.fraunhofer.de> | 2012-09-26 21:24:57 -0400 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2013-06-10 11:43:14 +0200 |
| commit | 4ae5f4a212db4c83983a2672a3c6c9e6a7a05559 (patch) | |
| tree | a3816de7c4fb0ce5d18bdf5582e08c7c82033bd5 /fs | |
| parent | e5180af75740e7239c37e1f63d5a67535209dae5 (diff) | |
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>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/namei.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 902f69bef2c7..828c9c91f42a 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1828,9 +1828,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); |