Restore the changes I made yesterday which broke build because I used a stale kernel.

[fs/lustre-release.git] / lustre / kernel_patches / patches / blkdev_tunables-2.6-sles10.patch

diff --git a/lustre/kernel_patches/patches/blkdev_tunables-2.6-sles10.patch b/lustre/kernel_patches/patches/blkdev_tunables-2.6-sles10.patch
index a2d7da2..5fbc8ab 100644 (file)
--- a/lustre/kernel_patches/patches/blkdev_tunables-2.6-sles10.patch
+++ b/lustre/kernel_patches/patches/blkdev_tunables-2.6-sles10.patch
@@ -1,7 +1,7 @@
-Index: linux-2616-46014/include/scsi/scsi_host.h
+Index: linux-2.6.16.54-0.2.3/include/scsi/scsi_host.h
 ===================================================================
---- linux-2616-46014.orig/include/scsi/scsi_host.h
-+++ linux-2616-46014/include/scsi/scsi_host.h
+--- linux-2.6.16.54-0.2.3.orig/include/scsi/scsi_host.h
++++ linux-2.6.16.54-0.2.3/include/scsi/scsi_host.h
 @@ -28,7 +28,7 @@ struct scsi_transport_template;
   *     used in one scatter-gather request.
   */
@@ -11,3 +11,15 @@ Index: linux-2616-46014/include/scsi/scsi_host.h
  
  
  #define DISABLE_CLUSTERING 0
+Index: linux-2.6.16.54-0.2.3/drivers/scsi/scsi_lib.c
+===================================================================
+--- linux-2.6.16.54-0.2.3.orig/drivers/scsi/scsi_lib.c
++++ linux-2.6.16.54-0.2.3/drivers/scsi/scsi_lib.c
+@@ -1573,6 +1573,7 @@ struct request_queue *scsi_alloc_queue(s
+ 
+       blk_queue_prep_rq(q, scsi_prep_fn);
+ 
++      blk_queue_max_phys_segments(q, SCSI_MAX_PHYS_SEGMENTS);
+       blk_queue_max_hw_segments(q, shost->sg_tablesize);
+       blk_queue_max_sectors(q, shost->max_sectors);
+       blk_queue_bounce_limit(q, scsi_calculate_bounce_limit(shost));