LU-206 Memory corruption due to MMP (1.8.5)

Change-Id: Ibc0c3ea76eb94c7a64f7e17711e9fe4b954cc37b
Signed-off-by: Bobi Jam <bobijam@whamcloud.com>
Reviewed-on: http://review.whamcloud.com/433
Tested-by: Hudson
Reviewed-by: Oleg Drokin <green@whamcloud.com>

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 bd0ac1c..9f93fcb 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-sles10.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-sles10.patch
@@ -386,7 +386,7 @@ Index: linux-stage/fs/ext3/super.c
 +              goto failed;
 +      }
 +
-+      mmpd_data = kmalloc(sizeof(struct mmpd_data *), GFP_KERNEL);
++      mmpd_data = kmalloc(sizeof(struct mmpd_data), GFP_KERNEL);
 +      if (!mmpd_data) {
 +              ext3_warning(sb, KERN_ERR, "not enough memory for mmpd_data");
 +              goto failed;

diff --git a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.18-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.18-vanilla.patch
index b056623..ad6f3f0 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.18-vanilla.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.18-vanilla.patch
@@ -390,7 +390,7 @@ Index: linux-stage/fs/ext3/super.c
 +              goto failed;
 +      }
 +
-+      mmpd_data = kmalloc(sizeof(struct mmpd_data *), GFP_KERNEL);
++      mmpd_data = kmalloc(sizeof(struct mmpd_data), GFP_KERNEL);
 +      if (!mmpd_data) {
 +              ext3_warning(sb, KERN_ERR, "not enough memory for mmpd_data");
 +              goto failed;

diff --git a/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch
index 7caff75..b0e8b67 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch
+++ b/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch
@@ -345,7 +345,7 @@ Index: linux-stage/fs/ext4/super.c
 +              goto failed;
 +      }
 +
-+      mmpd_data = kmalloc(sizeof(struct mmpd_data *), GFP_KERNEL);
++      mmpd_data = kmalloc(sizeof(struct mmpd_data), GFP_KERNEL);
 +      if (!mmpd_data) {
 +              ext4_warning(sb, KERN_ERR, "not enough memory for mmpd_data");
 +              goto failed;

diff --git a/ldiskfs/kernel_patches/patches/ext4-mmp-sles11.patch b/ldiskfs/kernel_patches/patches/ext4-mmp-sles11.patch
index 8755887..792cd59 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext4-mmp-sles11.patch
+++ b/ldiskfs/kernel_patches/patches/ext4-mmp-sles11.patch
@@ -348,7 +348,7 @@ Index: linux-stage/fs/ext4/super.c
 +              goto failed;
 +      }
 +
-+      mmpd_data = kmalloc(sizeof(struct mmpd_data *), GFP_KERNEL);
++      mmpd_data = kmalloc(sizeof(struct mmpd_data), GFP_KERNEL);
 +      if (!mmpd_data) {
 +              ext4_warning(sb, KERN_ERR, "not enough memory for mmpd_data");
 +              goto failed;