Branch HEAD

 b=20533
 i=adilger
 i=johann
----------------------------------------------------------------------
 Modified Files:
 	lustre/ChangeLog
 	lustre/kernel_patches/patches/raid5-large-io-rhel5.patch
 	lustre/kernel_patches/series/2.6-rhel5.series
 	lustre/kernel_patches/series/2.6-sles11.series
 Added Files:
 	lustre/kernel_patches/patches/blkdev_tunables-2.6-rhel5.patch
 	lustre/kernel_patches/patches/blkdev_tunables-2.6-sles11.patch
----------------------------------------------------------------------
Description: Changes in raid5-large-io-rhel5.patch to calculate sectors properly

Description: Increase the default BLK_DEF_MAX_SECTORS value for RHEL5 and SLES11

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 971701b..9332e4e 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -14,6 +14,14 @@ tbd  Sun Microsystems, Inc.
        * File join has been disabled in this release, refer to Bugzilla 16929.
 
 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
 Bugzilla   : 20482
 Description: Error handling in osc_statfs_interpret() has been improved.
 Details    : Check in osc_statfs_interpret() for EBADR.

diff --git a/lustre/kernel_patches/patches/blkdev_tunables-2.6-rhel5.patch b/lustre/kernel_patches/patches/blkdev_tunables-2.6-rhel5.patch
new file mode 100644 (file)
index 0000000..84a0ecb
--- /dev/null
+++ b/lustre/kernel_patches/patches/blkdev_tunables-2.6-rhel5.patch
@@ -0,0 +1,11 @@
+--- linux-2.6.18-128.1.14.orig/include/linux/blkdev.h  2009-06-19 04:03:20.000000000 -0400
++++ linux-2.6.18-128.1.14/include/linux/blkdev.h       2009-09-04 16:31:30.000000000 -0400
+@@ -778,7 +778,7 @@ extern int blkdev_issue_flush(struct blo
+ #define MAX_PHYS_SEGMENTS 128
+ #define MAX_HW_SEGMENTS 128
+ #define SAFE_MAX_SECTORS 255
+-#define BLK_DEF_MAX_SECTORS 1024
++#define BLK_DEF_MAX_SECTORS 2048
+ 
+ #define MAX_SEGMENT_SIZE      65536
+ 

diff --git a/lustre/kernel_patches/patches/blkdev_tunables-2.6-sles11.patch b/lustre/kernel_patches/patches/blkdev_tunables-2.6-sles11.patch
new file mode 100644 (file)
index 0000000..dea7372
--- /dev/null
+++ b/lustre/kernel_patches/patches/blkdev_tunables-2.6-sles11.patch
@@ -0,0 +1,11 @@
+--- linux-2.6.27.19-5.orig/include/linux/blkdev.h      2009-03-17 12:48:06.000000000 -0400
++++ linux-2.6.27.19-5/include/linux/blkdev.h   2009-09-04 18:04:43.000000000 -0400
+@@ -904,7 +904,7 @@ extern void blk_set_cmd_filter_defaults(
+ #define MAX_PHYS_SEGMENTS 128
+ #define MAX_HW_SEGMENTS 128
+ #define SAFE_MAX_SECTORS 255
+-#define BLK_DEF_MAX_SECTORS 1024
++#define BLK_DEF_MAX_SECTORS 2048
+ 
+ #define MAX_SEGMENT_SIZE      65536
+ 

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;

diff --git a/lustre/kernel_patches/series/2.6-rhel5.series b/lustre/kernel_patches/series/2.6-rhel5.series
index 70c5daa..071c4d7 100644 (file)
--- a/lustre/kernel_patches/series/2.6-rhel5.series
+++ b/lustre/kernel_patches/series/2.6-rhel5.series
@@ -8,6 +8,7 @@ export-2.6.18-vanilla.patch
 export-show_task-2.6.18-vanilla.patch
 sd_iostats-2.6-rhel5.patch
 export_symbol_numa-2.6-fc5.patch
+blkdev_tunables-2.6-rhel5.patch
 jbd-stats-2.6-rhel5.patch
 raid5-stats-rhel5.patch
 raid5-configurable-cachesize-rhel5.patch

diff --git a/lustre/kernel_patches/series/2.6-sles11.series b/lustre/kernel_patches/series/2.6-sles11.series
index 813d162..071c5be 100644 (file)
--- a/lustre/kernel_patches/series/2.6-sles11.series
+++ b/lustre/kernel_patches/series/2.6-sles11.series
@@ -4,6 +4,7 @@ export_symbols-2.6.22-vanilla.patch
 dev_read_only-2.6.27-vanilla.patch 
 export-2.6.27-vanilla.patch 
 sd_iostats-2.6.27-vanilla.patch
+blkdev_tunables-2.6-sles11.patch
 md-mmp-unplug-dev-sles11.patch
 quota-support-64-bit-quota-format.patch
 jbd2-jcberr-2.6-sles11.patch