From: Bobi Jam <bobijam@whamcloud.com>
Date: Mon, 11 Apr 2011 08:30:33 +0000 (+0800)
Subject: LU-206 Memory corruption due to MMP (1.8.5)
X-Git-Tag: 2.0.60.0~34
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=19de0afd629a3ffe714486cc75264ea14cea7346

LU-206 Memory corruption due to MMP (1.8.5)

Change-Id: Ia7c01488a7cc89193ff01a0086a34d42936844b5
Signed-off-by: Bobi Jam <bobijam@whamcloud.com>
Reviewed-on: http://review.whamcloud.com/420
Tested-by: Hudson
Reviewed-by: Johann Lombardi <johann@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

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 38a0eb1..34dc768 100644
--- 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 1001fa0..88f9efe 100644
--- 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-rhel6.patch b/ldiskfs/kernel_patches/patches/ext4-mmp-rhel6.patch
index ef49bbd..f5fe952 100644
--- a/ldiskfs/kernel_patches/patches/ext4-mmp-rhel6.patch
+++ b/ldiskfs/kernel_patches/patches/ext4-mmp-rhel6.patch
@@ -344,7 +344,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, "not enough memory for mmpd_data");
 +		goto failed;