2007-11-29 20:54:19

by Andrew Morton

[permalink] [raw]
Subject: [patch 6/8] ext4/super.c: fix #ifdef's

From: Adrian Bunk <[email protected]>

Fix the names of two variables in #ifdef's.

Based on a report by Robert P. J. Day.

Signed-off-by: Adrian Bunk <[email protected]>
Cc: "Robert P. J. Day" <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---

fs/ext4/super.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN fs/ext4/super.c~ext4-superc-fix-ifdefs fs/ext4/super.c
--- a/fs/ext4/super.c~ext4-superc-fix-ifdefs
+++ a/fs/ext4/super.c
@@ -709,7 +709,7 @@ static int ext4_show_options(struct seq_
seq_puts(seq, ",debug");
if (test_opt(sb, OLDALLOC))
seq_puts(seq, ",oldalloc");
-#ifdef CONFIG_EXT4_FS_XATTR
+#ifdef CONFIG_EXT4DEV_FS_XATTR
if (test_opt(sb, XATTR_USER))
seq_puts(seq, ",user_xattr");
if (!test_opt(sb, XATTR_USER) &&
@@ -717,7 +717,7 @@ static int ext4_show_options(struct seq_
seq_puts(seq, ",nouser_xattr");
}
#endif
-#ifdef CONFIG_EXT4_FS_POSIX_ACL
+#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL
if (test_opt(sb, POSIX_ACL))
seq_puts(seq, ",acl");
if (!test_opt(sb, POSIX_ACL) && (def_mount_opts & EXT4_DEFM_ACL))
_