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

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

Thanks for the fast fix - hope this goes soon into linus-tree.

(Missed a Reported-By, sorry).

--
Sedat

On Wed, Mar 24, 2010 at 5:12 PM,  <tytso@mit.edu> wrote:
> Thanks for catching this!  This should fix it up...
>
>                                           - Ted
>
> ext4: Fix build error when EXT4_USE_FOR_EXT23 disabled
>
> Fix a stupid type (CONTIG != CONFIG) and a stupid assumption that
> ext3_fs_type would always be defined.
>
> (The build failure could also happen when EXT4_USE_FOR_EXT23 is
> enabled and ext3 is built as a module.)
>
> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
> ---
>  fs/ext4/super.c |   11 +++++++----
>  1 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index 3d1a056..29c6875 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",
> @@ -79,6 +79,9 @@ static struct file_system_type ext3_fs_type = {
>        .kill_sb        = kill_block_super,
>        .fs_flags       = FS_REQUIRES_DEV,
>  };
> +#define IS_EXT3_SB(sb) ((sb)->s_bdev->bd_holder == &ext3_fs_type)
> +#else
> +#define IS_EXT3_SB(sb) (0)
>  #endif
>
>  ext4_fsblk_t ext4_block_bitmap(struct super_block *sb,
> @@ -2550,7 +2553,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
>         * enable delayed allocation by default
>         * Use -o nodelalloc to turn it off
>         */
> -       if (sb->s_bdev->bd_holder != &ext3_fs_type)
> +       if (!IS_EXT3_SB(sb))
>                set_opt(sbi->s_mount_opt, DELALLOC);
>
>        if (!parse_options((char *) data, sb, &journal_devnum,
> @@ -4080,7 +4083,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 +4110,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);
>
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html