Branch b1_6

b=12771
i=adilger
i=shadow

Add patch blkdev_tunables-2.6-sles10.patch to 2.6-sles10.series.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index d01b4c8..62019bb 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -33,6 +33,12 @@ Bugzilla   : 12211
 Description: randomly memory allocation failure util
 Details    : Make lustre randomly failed allocating memory for testing purpose.
 
+Severity   : normal
+Frequency  : only for SLES10
+Bugzilla   : 12771
+Description: Update kernel patch for SLES10 SP1
+Details    : Add patch blkdev_tunables-2.6-sles10.patch to 2.6-sles10.series.
+
 --------------------------------------------------------------------------------
 
 2007-07-30         Cluster File Systems, Inc. <info@clusterfs.com>

diff --git a/lustre/kernel_patches/patches/blkdev_tunables-2.6-sles10.patch b/lustre/kernel_patches/patches/blkdev_tunables-2.6-sles10.patch
new file mode 100644 (file)
index 0000000..a2d7da2
--- /dev/null
+++ b/lustre/kernel_patches/patches/blkdev_tunables-2.6-sles10.patch
@@ -0,0 +1,13 @@
+Index: linux-2616-46014/include/scsi/scsi_host.h
+===================================================================
+--- linux-2616-46014.orig/include/scsi/scsi_host.h
++++ linux-2616-46014/include/scsi/scsi_host.h
+@@ -28,7 +28,7 @@ struct scsi_transport_template;
+  *     used in one scatter-gather request.
+  */
+ #define SG_NONE 0
+-#define SG_ALL 0xff
++#define SG_ALL 256
+ 
+ 
+ #define DISABLE_CLUSTERING 0

diff --git a/lustre/kernel_patches/series/2.6-sles10.series b/lustre/kernel_patches/series/2.6-sles10.series
index 40d7509..fc7ce83 100644 (file)
--- a/lustre/kernel_patches/series/2.6-sles10.series
+++ b/lustre/kernel_patches/series/2.6-sles10.series
@@ -12,3 +12,4 @@ remove-suid-2.6-suse.patch
 export-show_task-2.6-fc5.patch 
 sd_iostats-2.6-rhel4.patch 
 export_symbol_numa-2.6-fc5.patch 
+blkdev_tunables-2.6-sles10.patch