From: dzogin <dzogin>
Date: Sun, 6 Sep 2009 16:24:26 +0000 (+0000)
Subject:  Branch b_release_1_8_1
X-Git-Tag: v1_8_1_1~48
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=25c3cae86733e4773329704160082d54c2e20ac3;p=fs%2Flustre-release.git

 Branch b_release_1_8_1
 b=20533
 i=johann
 i=adilger
----------------------------------------------------------------------
 Modified Files:
  Tag: b_release_1_8_1
 	lustre/ChangeLog
 	lustre/kernel_patches/patches/raid5-large-io-rhel5.patch
----------------------------------------------------------------------
Description: Changes in raid5-large-io-rhel5.patch to calculate sectors properly
---

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index f5fba20..ae66965 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -17,6 +17,10 @@ TBD Sun Microsystems, Inc.
 
 Severity   : normal
 Bugzilla   : 20533
+Description: Changes in raid5-large-io-rhel5.patch to calculate sectors properly
+
+Severity   : normal
+Bugzilla   : 20533
 Description: Increase the default BLK_DEF_MAX_SECTORS value for RHEL5 and SLES11
 
 Severity   : normal
diff --git a/lustre/kernel_patches/patches/raid5-large-io-rhel5.patch b/lustre/kernel_patches/patches/raid5-large-io-rhel5.patch
index a415611..6a712a9 100644
--- a/lustre/kernel_patches/patches/raid5-large-io-rhel5.patch
+++ b/lustre/kernel_patches/patches/raid5-large-io-rhel5.patch
@@ -7,7 +7,7 @@ diff -pur linux-2.6.18-53.orig/drivers/md/raid5.c linux-2.6.18-53/drivers/md/rai
  
 +	/* in order to support large I/Os */
 +	blk_queue_max_sectors(mddev->queue, conf->chunk_size * conf->previous_raid_disks >> 9);
-+	mddev->queue->max_phys_segments = conf->chunk_size * conf->previous_raid_disks >> PAGE_SHIFT;
++	mddev->queue->max_phys_segments = conf->chunk_size * (conf->previous_raid_disks - conf->max_degraded) >> PAGE_SHIFT;
 +	mddev->queue->max_hw_segments = conf->chunk_size * conf->previous_raid_disks >> PAGE_SHIFT;;
 +
  	return 0;