b=19058

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext3-mmp-2.6-sles10.patch

diff --git a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-sles10.patch b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-sles10.patch
index f05fc25..f441b91 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-sles10.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-sles10.patch
@@ -1,7 +1,7 @@
-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>
@@ -380,22 +380,24 @@ Index: linux-2.6.16.60-0.33/fs/ext3/super.c
  #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 */
@@ -473,10 +475,10 @@ Index: linux-2.6.16.60-0.33/include/linux/ext3_fs.h
   * 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;