2007-11-05 17:07:37

by Adrian Bunk

Subject: [2.6 patch] ext4/super.c: fix #ifdef's

This patch fixes the names of two variables in #ifdef's.

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

Signed-off-by: Adrian Bunk <[email protected]>

---

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

44e9889e6a3952ea225704b2e494d31e00f34a6b
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 8031dc0..6673672 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -646,7 +646,7 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs)
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) &&
@@ -654,7 +654,7 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs)
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))

2007-11-05 23:09:45

by Mingming Cao

Subject: Re: [2.6 patch] ext4/super.c: fix #ifdef's

Acked-by: Mingmming Cao <[email protected]>

Ted, I added this patch in ext4 patch queue.

On Mon, 2007-11-05 at 18:07 +0100, Adrian Bunk wrote:
> This patch fixes the names of two variables in #ifdef's.
>
> Based on a report by Robert P. J. Day.
>
> Signed-off-by: Adrian Bunk <[email protected]>
>
> ---
>
> fs/ext4/super.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> 44e9889e6a3952ea225704b2e494d31e00f34a6b
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index 8031dc0..6673672 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -646,7 +646,7 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs)
> 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) &&
> @@ -654,7 +654,7 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs)
> 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))
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html