Merge branch 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block

* 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block: (39 commits)
  cfq-iosched: Fix a gcc 4.5 warning and put some comments
  block: Turn bvec_k{un,}map_irq() into static inline functions
  block: fix accounting bug on cross partition merges
  block: Make the integrity mapped property a bio flag
  block: Fix double free in blk_integrity_unregister
  block: Ensure physical block size is unsigned int
  blkio-throttle: Fix possible multiplication overflow in iops calculations
  blkio-throttle: limit max iops value to UINT_MAX
  blkio-throttle: There is no need to convert jiffies to milli seconds
  blkio-throttle: Fix link failure failure on i386
  blkio: Recalculate the throttled bio dispatch time upon throttle limit change
  blkio: Add root group to td->tg_list
  blkio: deletion of a cgroup was causes oops
  blkio: Do not export throttle files if CONFIG_BLK_DEV_THROTTLING=n
  block: set the bounce_pfn to the actual DMA limit rather than to max memory
  block: revert bad fix for memory hotplug causing bounces
  Fix compile error in blk-exec.c for !CONFIG_DETECT_HUNG_TASK
  block: set the bounce_pfn to the actual DMA limit rather than to max memory
  block: Prevent hang_check firing during long I/O
  cfq: improve fsync performance for small files
  ...

Fix up trivial conflicts due to __rcu sparse annotation in include/linux/genhd.h

1 files changed, 18 insertions, 8 deletions

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index ee02d3838a0a..8041fe1ab179 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -968,11 +968,13 @@ static int scsi_init_sgtable(struct request *req, struct scsi_data_buffer *sdb,
  */
 int scsi_init_io(struct scsi_cmnd *cmd, gfp_t gfp_mask)
 {
-        int error = scsi_init_sgtable(cmd->request, &cmd->sdb, gfp_mask);
+        struct request *rq = cmd->request;
+
+        int error = scsi_init_sgtable(rq, &cmd->sdb, gfp_mask);
         if (error)
                 goto err_exit;
 
-        if (blk_bidi_rq(cmd->request)) {
+        if (blk_bidi_rq(rq)) {
                 struct scsi_data_buffer *bidi_sdb = kmem_cache_zalloc(
                         scsi_sdb_cache, GFP_ATOMIC);
                 if (!bidi_sdb) {
@@ -980,28 +982,28 @@ int scsi_init_io(struct scsi_cmnd *cmd, gfp_t gfp_mask)
                         goto err_exit;
                 }
 
-                cmd->request->next_rq->special = bidi_sdb;
-                error = scsi_init_sgtable(cmd->request->next_rq, bidi_sdb,
-                                                                    GFP_ATOMIC);
+                rq->next_rq->special = bidi_sdb;
+                error = scsi_init_sgtable(rq->next_rq, bidi_sdb, GFP_ATOMIC);
                 if (error)
                         goto err_exit;
         }
 
-        if (blk_integrity_rq(cmd->request)) {
+        if (blk_integrity_rq(rq)) {
                 struct scsi_data_buffer *prot_sdb = cmd->prot_sdb;
                 int ivecs, count;
 
                 BUG_ON(prot_sdb == NULL);
-                ivecs = blk_rq_count_integrity_sg(cmd->request);
+                ivecs = blk_rq_count_integrity_sg(rq->q, rq->bio);
 
                 if (scsi_alloc_sgtable(prot_sdb, ivecs, gfp_mask)) {
                         error = BLKPREP_DEFER;
                         goto err_exit;
                 }
 
-                count = blk_rq_map_integrity_sg(cmd->request,
+                count = blk_rq_map_integrity_sg(rq->q, rq->bio,
                                                 prot_sdb->table.sgl);
                 BUG_ON(unlikely(count > ivecs));
+                BUG_ON(unlikely(count > queue_max_integrity_segments(rq->q)));
 
                 cmd->prot_sdb = prot_sdb;
                 cmd->prot_sdb->table.nents = count;
@@ -1625,6 +1627,14 @@ struct request_queue *__scsi_alloc_queue(struct Scsi_Host *shost,
         blk_queue_max_segments(q, min_t(unsigned short, shost->sg_tablesize,
                                         SCSI_MAX_SG_CHAIN_SEGMENTS));
 
+        if (scsi_host_prot_dma(shost)) {
+                shost->sg_prot_tablesize =
+                        min_not_zero(shost->sg_prot_tablesize,
+                                     (unsigned short)SCSI_MAX_PROT_SG_SEGMENTS);
+                BUG_ON(shost->sg_prot_tablesize < shost->sg_tablesize);
+                blk_queue_max_integrity_segments(q, shost->sg_prot_tablesize);
+        }
+
         blk_queue_max_hw_sectors(q, shost->max_sectors);
         blk_queue_bounce_limit(q, scsi_calculate_bounce_limit(shost));
         blk_queue_segment_boundary(q, shost->dma_boundary);