ext4_ifdef_fix.patch

   1 ext4/super.c: fix #ifdef's (CONFIG_EXT4_* -> CONFIG_EXT4DEV_*)
   2
   3 From: Adrian Bunk <bunk@kernel.org>
   4
   5 Based on a report by Robert P. J. Day.
   6
   7 Signed-off-by: Adrian Bunk <bunk@kernel.org>
   8 ---
   9
  10  fs/ext4/super.c |    4 ++--
  11  1 files changed, 2 insertions(+), 2 deletions(-)
  12
  13
  14 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
  15 index 0931831..1484a08 100644
  16 --- a/fs/ext4/super.c
  17 +++ b/fs/ext4/super.c
  18 @@ -706,7 +706,7 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs)
  19                 seq_puts(seq, ",debug");
  20         if (test_opt(sb, OLDALLOC))
  21                 seq_puts(seq, ",oldalloc");
  22 -#ifdef CONFIG_EXT4_FS_XATTR
  23 +#ifdef CONFIG_EXT4DEV_FS_XATTR
  24         if (test_opt(sb, XATTR_USER))
  25                 seq_puts(seq, ",user_xattr");
  26         if (!test_opt(sb, XATTR_USER) &&
  27 @@ -714,7 +714,7 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs)
  28                 seq_puts(seq, ",nouser_xattr");
  29         }
  30  #endif
  31 -#ifdef CONFIG_EXT4_FS_POSIX_ACL
  32 +#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL
  33         if (test_opt(sb, POSIX_ACL))
  34                 seq_puts(seq, ",acl");
  35         if (!test_opt(sb, POSIX_ACL) && (def_mount_opts & EXT4_DEFM_ACL))