Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

ext4: Do not override ext2 or ext3 if built they are built as modules

Browse source 
The CONFIG_EXT4_USE_FOR_EXT23 option must not try to take over the
ext2 or ext3 file systems if the those file system drivers are
configured to be built as mdoules.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o 2009-12-09 21:09:58 -05:00
parent 3b799d15f2
commit a214238d3b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/ext4/Kconfig
View file

@ -28,7 +28,7 @@ config EXT4_FS
config EXT4_USE_FOR_EXT23 config EXT4_USE_FOR_EXT23
bool "Use ext4 for ext2/ext3 file systems" bool "Use ext4 for ext2/ext3 file systems"
depends on !EXT3_FS || !EXT2_FS depends on EXT3_FS=n || EXT2_FS=n
default y default y
help help
Allow the ext4 file system driver code to be used for ext2 or Allow the ext4 file system driver code to be used for ext2 or

4
fs/ext4/super.c
View file

@ -3964,7 +3964,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); return get_sb_bdev(fs_type, flags, dev_name, data, ext4_fill_super,mnt);
} }
#if !defined(CONTIG_EXT2_FS) && defined(CONFIG_EXT4_USE_FOR_EXT23) #if !defined(CONTIG_EXT2_FS) && !defined(CONFIG_EXT2_FS_MODULE) && defined(CONFIG_EXT4_USE_FOR_EXT23)
static struct file_system_type ext2_fs_type = { static struct file_system_type ext2_fs_type = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "ext2", .name = "ext2",
@ -3990,7 +3990,7 @@ static inline void register_as_ext2(void) { }
static inline void unregister_as_ext2(void) { } static inline void unregister_as_ext2(void) { }
#endif #endif
#if !defined(CONTIG_EXT3_FS) && defined(CONFIG_EXT4_USE_FOR_EXT23) #if !defined(CONTIG_EXT3_FS) && !defined(CONFIG_EXT3_FS_MODULE) && defined(CONFIG_EXT4_USE_FOR_EXT23)
static struct file_system_type ext3_fs_type = { static struct file_system_type ext3_fs_type = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "ext3", .name = "ext3",