From: vs <vs>
Date: Thu, 20 Nov 2008 23:24:31 +0000 (+0000)
Subject: Branch HEAD
X-Git-Tag: v1_9_120~111
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=bbff1e2161add7577ba2d524553f618b2219bff7

Branch HEAD
b=17132
i=adilger

Use raid5/6 rhel5 improvements
---

diff --git a/lustre/kernel_patches/patches/raid5-merge-ios-rhel5.patch b/lustre/kernel_patches/patches/raid5-merge-ios-rhel5.patch
index 735af2c..decf7a4 100644
--- a/lustre/kernel_patches/patches/raid5-merge-ios-rhel5.patch
+++ b/lustre/kernel_patches/patches/raid5-merge-ios-rhel5.patch
@@ -1,6 +1,7 @@
-diff -pur linux-2.6.18-53.orig/drivers/md/raid5.c linux-2.6.18-53/drivers/md/raid5.c
---- linux-2.6.18-53.orig/drivers/md/raid5.c	2007-12-28 18:55:24.000000000 +0800
-+++ linux-2.6.18-53/drivers/md/raid5.c	2007-12-28 19:08:15.000000000 +0800
+Index: linux-2.6.18-92.1.17/drivers/md/raid5.c
+===================================================================
+--- linux-2.6.18-92.1.17.orig/drivers/md/raid5.c
++++ linux-2.6.18-92.1.17/drivers/md/raid5.c
 @@ -1277,7 +1277,26 @@ static void compute_block_2(struct strip
  	}
  }
@@ -151,7 +152,7 @@ diff -pur linux-2.6.18-53.orig/drivers/md/raid5.c linux-2.6.18-53/drivers/md/rai
  		}
  		if (sh) {
 -			handle_stripe(sh, NULL);
-+			handle_stripe(sh, NULL, NULL);
++			handle_stripe(sh, NULL, bios);
  			release_stripe(sh);
  			sh = NULL;
  		}