-Index: linux-2.6.16.60-0.33/fs/ext3/super.c
+Index: linux-2.6.16.60-0.37/fs/ext3/super.c
===================================================================
---- linux-2.6.16.60-0.33.orig/fs/ext3/super.c
-+++ linux-2.6.16.60-0.33/fs/ext3/super.c
+--- linux-2.6.16.60-0.37.orig/fs/ext3/super.c
++++ linux-2.6.16.60-0.37/fs/ext3/super.c
@@ -36,6 +36,8 @@
#include <linux/namei.h>
#include <linux/quotaops.h>
#ifdef CONFIG_QUOTA
int i;
#endif
-@@ -2547,6 +2881,11 @@ static int ext3_remount (struct super_bl
+@@ -2547,6 +2881,13 @@ static int ext3_remount (struct super_bl
}
if (!ext3_setup_super (sb, es, 0))
sb->s_flags &= ~MS_RDONLY;
+ if (EXT3_HAS_INCOMPAT_FEATURE(sb,
+ EXT3_FEATURE_INCOMPAT_MMP))
+ if (ext3_multi_mount_protect(sb,
-+ le64_to_cpu(es->s_mmp_block)))
++ le64_to_cpu(es->s_mmp_block))) {
++ err = -EROFS;
+ goto restore_opts;
++ }
}
}
#ifdef CONFIG_QUOTA
-Index: linux-2.6.16.60-0.33/include/linux/ext3_fs.h
+Index: linux-2.6.16.60-0.37/include/linux/ext3_fs.h
===================================================================
---- linux-2.6.16.60-0.33.orig/include/linux/ext3_fs.h
-+++ linux-2.6.16.60-0.33/include/linux/ext3_fs.h
+--- linux-2.6.16.60-0.37.orig/include/linux/ext3_fs.h
++++ linux-2.6.16.60-0.37/include/linux/ext3_fs.h
@@ -597,13 +597,17 @@ struct ext3_super_block {
__le32 s_first_meta_bg; /* First metablock block group */
__le32 s_mkfs_time; /* When the filesystem was created */
* Function prototypes
*/
-Index: linux-2.6.16.60-0.33/include/linux/ext3_fs_sb.h
+Index: linux-2.6.16.60-0.37/include/linux/ext3_fs_sb.h
===================================================================
---- linux-2.6.16.60-0.33.orig/include/linux/ext3_fs_sb.h
-+++ linux-2.6.16.60-0.33/include/linux/ext3_fs_sb.h
+--- linux-2.6.16.60-0.37.orig/include/linux/ext3_fs_sb.h
++++ linux-2.6.16.60-0.37/include/linux/ext3_fs_sb.h
@@ -147,6 +147,7 @@ struct ext3_sb_info {
/* locality groups */
struct ext3_locality_group *s_locality_groups;
-Index: linux-2.6.18-92.1.22/fs/ext3/super.c
+Index: linux-2.6.18-128.1.6/fs/ext3/super.c
===================================================================
---- linux-2.6.18-92.1.22.orig/fs/ext3/super.c
-+++ linux-2.6.18-92.1.22/fs/ext3/super.c
+--- linux-2.6.18-128.1.6.orig/fs/ext3/super.c
++++ linux-2.6.18-128.1.6/fs/ext3/super.c
@@ -35,6 +35,8 @@
#include <linux/namei.h>
#include <linux/quotaops.h>
#include <asm/uaccess.h>
-@@ -435,6 +437,8 @@ static void ext3_put_super (struct super
+@@ -440,6 +442,8 @@ static void ext3_put_super (struct super
invalidate_bdev(sbi->journal_bdev, 0);
ext3_blkdev_remove(sbi);
}
if (sbi->s_dev_proc) {
remove_proc_entry(sbi->s_dev_proc->name, proc_root_ext3);
sbi->s_dev_proc = NULL;
-@@ -1543,6 +1547,329 @@ static ext3_fsblk_t descriptor_loc(struc
+@@ -1548,6 +1552,329 @@ 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)
{
-@@ -1875,6 +2202,11 @@ static int ext3_fill_super (struct super
+@@ -1880,6 +2207,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!
-@@ -2007,6 +2339,8 @@ cantfind_ext3:
+@@ -2012,6 +2344,8 @@ cantfind_ext3:
failed_mount4:
journal_destroy(sbi->s_journal);
failed_mount3:
percpu_counter_destroy(&sbi->s_freeblocks_counter);
percpu_counter_destroy(&sbi->s_freeinodes_counter);
percpu_counter_destroy(&sbi->s_dirs_counter);
-@@ -2482,7 +2816,7 @@ static int ext3_remount (struct super_bl
+@@ -2497,7 +2831,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
-@@ -2580,6 +2914,11 @@ static int ext3_remount (struct super_bl
+@@ -2595,6 +2929,13 @@ static int ext3_remount (struct super_bl
}
if (!ext3_setup_super (sb, es, 0))
sb->s_flags &= ~MS_RDONLY;
+ if (EXT3_HAS_INCOMPAT_FEATURE(sb,
+ EXT3_FEATURE_INCOMPAT_MMP))
+ if (ext3_multi_mount_protect(sb,
-+ le64_to_cpu(es->s_mmp_block)))
++ le64_to_cpu(es->s_mmp_block))) {
++ err = -EROFS;
+ goto restore_opts;
++ }
}
}
#ifdef CONFIG_QUOTA
-Index: linux-2.6.18-92.1.22/include/linux/ext3_fs.h
+Index: linux-2.6.18-128.1.6/include/linux/ext3_fs.h
===================================================================
---- linux-2.6.18-92.1.22.orig/include/linux/ext3_fs.h
-+++ linux-2.6.18-92.1.22/include/linux/ext3_fs.h
+--- linux-2.6.18-128.1.6.orig/include/linux/ext3_fs.h
++++ linux-2.6.18-128.1.6/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 */
* Function prototypes
*/
-Index: linux-2.6.18-92.1.22/include/linux/ext3_fs_sb.h
+Index: linux-2.6.18-128.1.6/include/linux/ext3_fs_sb.h
===================================================================
---- linux-2.6.18-92.1.22.orig/include/linux/ext3_fs_sb.h
-+++ linux-2.6.18-92.1.22/include/linux/ext3_fs_sb.h
+--- linux-2.6.18-128.1.6.orig/include/linux/ext3_fs_sb.h
++++ linux-2.6.18-128.1.6/include/linux/ext3_fs_sb.h
@@ -158,6 +158,7 @@ struct ext3_sb_info {
/* locality groups */
struct ext3_locality_group *s_locality_groups;