| 1 | From a214238d3bb03723f820b0a398928d8e1637c987 Mon Sep 17 00:00:00 2001 |
| 2 | From: Theodore Ts'o <tytso@mit.edu> |
| 3 | Date: Wed, 9 Dec 2009 21:09:58 -0500 |
| 4 | Subject: [PATCH] ext4: Do not override ext2 or ext3 if built they are built as modules |
| 5 | |
| 6 | The CONFIG_EXT4_USE_FOR_EXT23 option must not try to take over the |
| 7 | ext2 or ext3 file systems if the those file system drivers are |
| 8 | configured to be built as mdoules. |
| 9 | |
| 10 | Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> |
| 11 | --- |
| 12 | fs/ext4/Kconfig | 2 +- |
| 13 | fs/ext4/super.c | 4 ++-- |
| 14 | 2 files changed, 3 insertions(+), 3 deletions(-) |
| 15 | |
| 16 | --- a/fs/ext4/Kconfig |
| 17 | +++ b/fs/ext4/Kconfig |
| 18 | @@ -28,7 +28,7 @@ config EXT4_FS |
| 19 | |
| 20 | config EXT4_USE_FOR_EXT23 |
| 21 | bool "Use ext4 for ext2/ext3 file systems" |
| 22 | - depends on !EXT3_FS || !EXT2_FS |
| 23 | + depends on EXT3_FS=n || EXT2_FS=n |
| 24 | default y |
| 25 | help |
| 26 | Allow the ext4 file system driver code to be used for ext2 or |
| 27 | --- a/fs/ext4/super.c |
| 28 | +++ b/fs/ext4/super.c |
| 29 | @@ -3994,7 +3994,7 @@ static int ext4_get_sb(struct file_syste |
| 30 | return get_sb_bdev(fs_type, flags, dev_name, data, ext4_fill_super,mnt); |
| 31 | } |
| 32 | |
| 33 | -#if !defined(CONTIG_EXT2_FS) && defined(CONFIG_EXT4_USE_FOR_EXT23) |
| 34 | +#if !defined(CONTIG_EXT2_FS) && !defined(CONFIG_EXT2_FS_MODULE) && defined(CONFIG_EXT4_USE_FOR_EXT23) |
| 35 | static struct file_system_type ext2_fs_type = { |
| 36 | .owner = THIS_MODULE, |
| 37 | .name = "ext2", |
| 38 | @@ -4020,7 +4020,7 @@ static inline void register_as_ext2(void |
| 39 | static inline void unregister_as_ext2(void) { } |
| 40 | #endif |
| 41 | |
| 42 | -#if !defined(CONTIG_EXT3_FS) && defined(CONFIG_EXT4_USE_FOR_EXT23) |
| 43 | +#if !defined(CONTIG_EXT3_FS) && !defined(CONFIG_EXT3_FS_MODULE) && defined(CONFIG_EXT4_USE_FOR_EXT23) |
| 44 | static struct file_system_type ext3_fs_type = { |
| 45 | .owner = THIS_MODULE, |
| 46 | .name = "ext3", |
| 47 | |
