| From e0dd279e42d2f7c7e268be6d219f13a3c36dc524 Mon Sep 17 00:00:00 2001 |
| From: Bernd Schubert <bernd.schubert@itwm.fraunhofer.de> |
| Date: Wed, 26 Sep 2012 21:24:57 -0400 |
| Subject: [PATCH] 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| fs/ext4/namei.c | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c |
| index 41198b355a26..683c0f9d8a83 100644 |
| --- a/fs/ext4/namei.c |
| +++ b/fs/ext4/namei.c |
| @@ -1825,9 +1825,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); |
| -- |
| 1.8.5.2 |
| |
