-Index: linux-2.6.18/fs/ext3/super.c
+Index: linux-2.6.18-92.1.17/fs/ext3/super.c
===================================================================
---- linux-2.6.18.orig/fs/ext3/super.c
-+++ linux-2.6.18/fs/ext3/super.c
+--- linux-2.6.18-92.1.17.orig/fs/ext3/super.c
++++ linux-2.6.18-92.1.17/fs/ext3/super.c
@@ -35,6 +35,8 @@
#include <linux/namei.h>
#include <linux/quotaops.h>
#include <asm/uaccess.h>
-@@ -435,6 +437,9 @@ static void ext3_put_super (struct super
+@@ -435,6 +437,8 @@ static void ext3_put_super (struct super
invalidate_bdev(sbi->journal_bdev, 0);
ext3_blkdev_remove(sbi);
}
+ if (sbi->s_mmp_tsk)
+ kthread_stop(sbi->s_mmp_tsk);
-+
- remove_proc_entry(sb->s_id, proc_root_ext3);
- sbi->s_dev_proc = NULL;
- sb->s_fs_info = NULL;
-@@ -1536,6 +1541,313 @@ static ext3_fsblk_t descriptor_loc(struc
+ if (sbi->s_dev_proc) {
+ remove_proc_entry(sbi->s_dev_proc->name, proc_root_ext3);
+ sbi->s_dev_proc = NULL;
+@@ -1543,6 +1547,313 @@ static ext3_fsblk_t descriptor_loc(struc
return (has_super + ext3_group_first_block_no(sb, bg));
}
static int ext3_fill_super (struct super_block *sb, void *data, int silent)
{
-@@ -1844,6 +2156,11 @@ static int ext3_fill_super (struct super
+@@ -1875,6 +2186,11 @@ static int ext3_fill_super (struct super
EXT3_HAS_INCOMPAT_FEATURE(sb,
EXT3_FEATURE_INCOMPAT_RECOVER));
/*
* The first inode we look at is the journal inode. Don't try
* root first: it may be modified in the journal!
-@@ -2446,7 +2763,7 @@ static int ext3_remount (struct super_bl
+@@ -2482,7 +2798,7 @@ static int ext3_remount (struct super_bl
ext3_fsblk_t n_blocks_count = 0;
unsigned long old_sb_flags;
struct ext3_mount_options old_opts;
#ifdef CONFIG_QUOTA
int i;
#endif
-@@ -2530,6 +2847,11 @@ static int ext3_remount (struct super_bl
+@@ -2580,6 +2896,11 @@ static int ext3_remount (struct super_bl
}
if (!ext3_setup_super (sb, es, 0))
sb->s_flags &= ~MS_RDONLY;
}
}
#ifdef CONFIG_QUOTA
-Index: linux-2.6.18/include/linux/ext3_fs.h
+Index: linux-2.6.18-92.1.17/include/linux/ext3_fs.h
===================================================================
---- linux-2.6.18.orig/include/linux/ext3_fs.h
-+++ linux-2.6.18/include/linux/ext3_fs.h
-@@ -593,13 +593,17 @@ struct ext3_super_block {
+--- linux-2.6.18-92.1.17.orig/include/linux/ext3_fs.h
++++ linux-2.6.18-92.1.17/include/linux/ext3_fs.h
+@@ -594,13 +594,17 @@ struct ext3_super_block {
__le32 s_first_meta_bg; /* First metablock block group */
__le32 s_mkfs_time; /* When the filesystem was created */
__le32 s_jnl_blocks[17]; /* Backup of the journal inode */
};
#ifdef __KERNEL__
-@@ -702,12 +706,14 @@ static inline int ext3_valid_inum(struct
+@@ -703,12 +707,14 @@ static inline int ext3_valid_inum(struct
#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008 /* Journal device */
#define EXT3_FEATURE_INCOMPAT_META_BG 0x0010
#define EXT3_FEATURE_INCOMPAT_EXTENTS 0x0040 /* extents support */
#define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
EXT4_FEATURE_RO_COMPAT_GDT_CSUM| \
-@@ -870,6 +876,39 @@ ext3_group_first_block_no(struct super_b
+@@ -871,6 +877,39 @@ ext3_group_first_block_no(struct super_b
#define ERR_BAD_DX_DIR -75000
/*
* Function prototypes
*/
-Index: linux-2.6.18/include/linux/ext3_fs_sb.h
+Index: linux-2.6.18-92.1.17/include/linux/ext3_fs_sb.h
===================================================================
---- linux-2.6.18.orig/include/linux/ext3_fs_sb.h
-+++ linux-2.6.18/include/linux/ext3_fs_sb.h
-@@ -151,6 +151,7 @@ struct ext3_sb_info {
+--- linux-2.6.18-92.1.17.orig/include/linux/ext3_fs_sb.h
++++ linux-2.6.18-92.1.17/include/linux/ext3_fs_sb.h
+@@ -158,6 +158,7 @@ struct ext3_sb_info {
/* locality groups */
struct ext3_locality_group *s_locality_groups;