Branch b1_8

 b=20533
 i=johann
 i=adilger
----------------------------------------------------------------------
 Modified Files:
  Tag: b1_8
 	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 5e12d2d..e940f88 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -16,6 +16,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 (file)
--- 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;