mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
add 2.6.32 patches to use ext4 for ext2/3
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24082 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -0,0 +1,46 @@
|
||||
From a214238d3bb03723f820b0a398928d8e1637c987 Mon Sep 17 00:00:00 2001
|
||||
From: Theodore Ts'o <tytso@mit.edu>
|
||||
Date: Wed, 9 Dec 2009 21:09:58 -0500
|
||||
Subject: [PATCH] ext4: Do not override ext2 or ext3 if built they are built as modules
|
||||
|
||||
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>
|
||||
---
|
||||
fs/ext4/Kconfig | 2 +-
|
||||
fs/ext4/super.c | 4 ++--
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
--- a/fs/ext4/Kconfig
|
||||
+++ b/fs/ext4/Kconfig
|
||||
@@ -28,7 +28,7 @@ config EXT4_FS
|
||||
|
||||
config EXT4_USE_FOR_EXT23
|
||||
bool "Use ext4 for ext2/ext3 file systems"
|
||||
- depends on !EXT3_FS || !EXT2_FS
|
||||
+ depends on EXT3_FS=n || EXT2_FS=n
|
||||
default y
|
||||
help
|
||||
Allow the ext4 file system driver code to be used for ext2 or
|
||||
--- a/fs/ext4/super.c
|
||||
+++ b/fs/ext4/super.c
|
||||
@@ -3989,7 +3989,7 @@ static int ext4_get_sb(struct file_syste
|
||||
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 = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "ext2",
|
||||
@@ -4015,7 +4015,7 @@ static inline void register_as_ext2(void
|
||||
static inline void unregister_as_ext2(void) { }
|
||||
#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 = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "ext3",
|
||||
Reference in New Issue
Block a user