From: adilger <adilger>
Date: Wed, 4 Jul 2007 20:05:53 +0000 (+0000)
Subject: Branch b1_6
X-Git-Tag: v1_7_100~31
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=58e0a812631eac5c3dee3a9bf82328bc54aadf4c

Branch b1_6
Fix check for s->history allocation NULL return.
b=11039
i=alex
---

diff --git a/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6-fc5.patch b/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6-fc5.patch
index 90a9123..1964a6a 100644
--- a/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6-fc5.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6-fc5.patch
@@ -2068,7 +2068,7 @@ Index: linux-2.6.16.i686/fs/ext3/mballoc.c
 +		return -EIO;
 +	size = sizeof(struct ext3_mb_history) * sbi->s_mb_history_max;
 +	s->history = kmalloc(size, GFP_KERNEL);
-+	if (s == NULL) {
++	if (s->history == NULL) {
 +		kfree(s);
 +		return -EIO;
 +	}
diff --git a/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6.12.patch b/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6.12.patch
index 135262a..ad07714 100644
--- a/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6.12.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6.12.patch
@@ -2067,7 +2067,7 @@ Index: linux-2.6.12.6-bull/fs/ext3/mballoc.c
 +		return -EIO;
 +	size = sizeof(struct ext3_mb_history) * sbi->s_mb_history_max;
 +	s->history = kmalloc(size, GFP_KERNEL);
-+	if (s == NULL) {
++	if (s->history == NULL) {
 +		kfree(s);
 +		return -EIO;
 +	}
diff --git a/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6.9-rhel4.patch b/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6.9-rhel4.patch
index 4512098..f80b66e 100644
--- a/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6.9-rhel4.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6.9-rhel4.patch
@@ -2086,7 +2086,7 @@ Index: linux-2.6.9-full/fs/ext3/mballoc.c
 +		return -EIO;
 +	size = sizeof(struct ext3_mb_history) * sbi->s_mb_history_max;
 +	s->history = kmalloc(size, GFP_KERNEL);
-+	if (s == NULL) {
++	if (s->history == NULL) {
 +		kfree(s);
 +		return -EIO;
 +	}