releases/3.6.2/ext4-always-set-i_op-in-ext4_mknod.patch

   1 From 6a08f447facb4f9e29fcc30fb68060bb5a0d21c2 Mon Sep 17 00:00:00 2001
   2 From: Bernd Schubert <bernd.schubert@itwm.fraunhofer.de>
   3 Date: Wed, 26 Sep 2012 21:24:57 -0400
   4 Subject: ext4: always set i_op in ext4_mknod()
   5
   6 From: Bernd Schubert <bernd.schubert@itwm.fraunhofer.de>
   7
   8 commit 6a08f447facb4f9e29fcc30fb68060bb5a0d21c2 upstream.
   9
  10 ext4_special_inode_operations have their own ifdef CONFIG_EXT4_FS_XATTR
  11 to mask those methods. And ext4_iget also always sets it, so there is
  12 an inconsistency.
  13
  14 Signed-off-by: Bernd Schubert <bernd.schubert@itwm.fraunhofer.de>
  15 Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
  16 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  17
  18 ---
  19  fs/ext4/namei.c |    2 --
  20  1 file changed, 2 deletions(-)
  21
  22 --- a/fs/ext4/namei.c
  23 +++ b/fs/ext4/namei.c
  24 @@ -2149,9 +2149,7 @@ retry:
  25         err = PTR_ERR(inode);
  26         if (!IS_ERR(inode)) {
  27                 init_special_inode(inode, inode->i_mode, rdev);
  28 -#ifdef CONFIG_EXT4_FS_XATTR
  29                 inode->i_op = &ext4_special_inode_operations;
  30 -#endif
  31                 err = ext4_add_nondir(handle, dentry, inode);
  32         }
  33         ext4_journal_stop(handle);