[PATCH] ext4/super.c: Replace CONTIG_EXT{2,3}_FS by CONFIG_EXT{2,3}_FS

[Sedat Dilek <sedat.dilek@googlemail.com>]

[-- Attachment #1: Type: text/plain, Size: 1475 bytes --]

Hi,

today I pulled ext4 for_linus GIT branch into linus-tree (2.6.24-rc2-git1).

Unfortunately, the build breaks here:
...
  CC [M]  fs/ext4/super.o
  CC [M]  sound/isa/wavefront/wavefront_fx.o
  CC [M]  drivers/ata/pata_acpi.o
fs/ext4/super.c: In function ‘ext4_fill_super’:
fs/ext4/super.c:2553: error: ‘ext3_fs_type’ undeclared (first use in
this function)
fs/ext4/super.c:2553: error: (Each undeclared identifier is reported only once
fs/ext4/super.c:2553: error: for each function it appears in.)
make[5]: *** [fs/ext4/super.o] Error 1
...

While investigating the problem I found several typos in fs/ext4/super.c.
One of them was introduced with:

commit 2c7532a9b5fc3c27775f59e28d5f1ee4b1a1052e
"ext4: Don't use delayed allocation by default when used instead of ext3"

Furthermore, I have set the following CONFIG_EXT*FS* parameters:

$ zgrep CONFIG_EXT /proc/config.gz | grep FS
CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
# CONFIG_EXT2_FS_XIP is not set
CONFIG_EXT3_FS=m
CONFIG_EXT3_FS_XATTR=y
CONFIG_EXT3_FS_POSIX_ACL=y
CONFIG_EXT3_FS_SECURITY=y
CONFIG_EXT4_FS=m
CONFIG_EXT4_FS_XATTR=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y

My patch is not fixing the problem, just the typos.
Please have a closer look into it, thanks.

--
Sedat

[1] http://git.kernel.org/?p=linux/kernel/git/tytso/ext4.git;a=commit;h=2c7532a9b5fc3c27775f59e28d5f1ee4b1a1052e

[-- Attachment #2: 0001-ext4-super.c-Replace-CONTIG_EXT-2-3-_FS-by-CONFIG_EX.patch --]
[-- Type: text/x-diff, Size: 2004 bytes --]

From a3d5886d3cdaadcdc154413347f20ca2bdb5c615 Mon Sep 17 00:00:00 2001
From: Sedat Dilek <sedat.dilek@gmail.com>
Date: Wed, 24 Mar 2010 11:21:24 +0100
Subject: [PATCH] ext4/super.c: Replace CONTIG_EXT{2,3}_FS by CONFIG_EXT{2,3}_FS

One typo was introduced with:

commit 2c7532a9b5fc3c27775f59e28d5f1ee4b1a1052e
"ext4: Don't use delayed allocation by default when used instead of ext3"
---
 fs/ext4/super.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 1a1ccd4..1dbb37a 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -71,7 +71,7 @@ static int ext4_freeze(struct super_block *sb);
 static int ext4_get_sb(struct file_system_type *fs_type, int flags,
 		       const char *dev_name, void *data, struct vfsmount *mnt);
 
-#if !defined(CONTIG_EXT3_FS) && !defined(CONFIG_EXT3_FS_MODULE) && defined(CONFIG_EXT4_USE_FOR_EXT23)
+#if !defined(CONFIG_EXT3_FS) && !defined(CONFIG_EXT3_FS_MODULE) && defined(CONFIG_EXT4_USE_FOR_EXT23)
 static struct file_system_type ext3_fs_type = {
 	.owner		= THIS_MODULE,
 	.name		= "ext3",
@@ -4080,7 +4080,7 @@ static int ext4_get_sb(struct file_system_type *fs_type, int flags,
 	return get_sb_bdev(fs_type, flags, dev_name, data, ext4_fill_super,mnt);
 }
 
-#if !defined(CONTIG_EXT2_FS) && !defined(CONFIG_EXT2_FS_MODULE) && defined(CONFIG_EXT4_USE_FOR_EXT23)
+#if !defined(CONFIG_EXT2_FS) && !defined(CONFIG_EXT2_FS_MODULE) && defined(CONFIG_EXT4_USE_FOR_EXT23)
 static struct file_system_type ext2_fs_type = {
 	.owner		= THIS_MODULE,
 	.name		= "ext2",
@@ -4107,7 +4107,7 @@ static inline void register_as_ext2(void) { }
 static inline void unregister_as_ext2(void) { }
 #endif
 
-#if !defined(CONTIG_EXT3_FS) && !defined(CONFIG_EXT3_FS_MODULE) && defined(CONFIG_EXT4_USE_FOR_EXT23)
+#if !defined(CONFIG_EXT3_FS) && !defined(CONFIG_EXT3_FS_MODULE) && defined(CONFIG_EXT4_USE_FOR_EXT23)
 static inline void register_as_ext3(void)
 {
 	int err = register_filesystem(&ext3_fs_type);
-- 
1.7.0.3