block: Consolidate phys_segment and hw_segment limits

Except for SCSI no device drivers distinguish between physical and
hardware segment limits.  Consolidate the two into a single segment
limit.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

28 files changed, 33 insertions, 62 deletions

diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 0c82d335c55d..684fe04dbbb7 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -772,7 +772,7 @@ static int nv_adma_slave_config(struct scsi_device *sdev)
         }
 
         blk_queue_segment_boundary(sdev->request_queue, segment_boundary);
-        blk_queue_max_hw_segments(sdev->request_queue, sg_tablesize);
+        blk_queue_max_segments(sdev->request_queue, sg_tablesize);
         ata_port_printk(ap, KERN_INFO,
                 "DMA mask 0x%llX, segment boundary 0x%lX, hw segs %hu\n",
                 (unsigned long long)*ap->host->dev->dma_mask,
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 1c0cd35e1913..459f1bc25a7b 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -2534,7 +2534,7 @@ static bool DAC960_RegisterBlockDevice(DAC960_Controller_T *Controller)
         blk_queue_bounce_limit(RequestQueue, Controller->BounceBufferLimit);
         RequestQueue->queuedata = Controller;
         blk_queue_max_hw_segments(RequestQueue, Controller->DriverScatterGatherLimit);
-        blk_queue_max_phys_segments(RequestQueue, Controller->DriverScatterGatherLimit);
+        blk_queue_max_segments(RequestQueue, Controller->DriverScatterGatherLimit);
         blk_queue_max_hw_sectors(RequestQueue, Controller->MaxBlocksPerCommand);
         disk->queue = RequestQueue;
         sprintf(disk->disk_name, "rd/c%dd%d", Controller->ControllerNumber, n);
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 030e52d72254..a29e69418a03 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1797,10 +1797,7 @@ static int cciss_add_disk(ctlr_info_t *h, struct gendisk *disk,
         blk_queue_bounce_limit(disk->queue, h->pdev->dma_mask);
 
         /* This is a hardware imposed limit. */
-        blk_queue_max_hw_segments(disk->queue, h->maxsgentries);
-
-        /* This is a limit in the driver and could be eliminated. */
-        blk_queue_max_phys_segments(disk->queue, h->maxsgentries);
+        blk_queue_max_segments(disk->queue, h->maxsgentries);
 
         blk_queue_max_hw_sectors(disk->queue, h->cciss_max_sectors);
 
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 6422651ec364..91d11631cec9 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -448,11 +448,8 @@ static int __init cpqarray_register_ctlr( int i, struct pci_dev *pdev)
                 blk_queue_bounce_limit(q, hba[i]->pci_dev->dma_mask);
 
         /* This is a hardware imposed limit. */
-        blk_queue_max_hw_segments(q, SG_MAX);
+        blk_queue_max_segments(q, SG_MAX);
 
-        /* This is a driver limit and could be eliminated. */
-        blk_queue_max_phys_segments(q, SG_MAX);
-        
         init_timer(&hba[i]->timer);
         hba[i]->timer.expires = jiffies + IDA_TIMER;
         hba[i]->timer.data = (unsigned long)hba[i];
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 9b55e64196fc..4df3b40b1057 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -710,8 +710,7 @@ void drbd_setup_queue_param(struct drbd_conf *mdev, unsigned int max_seg_s) __mu
         max_seg_s = min(queue_max_sectors(b) * queue_logical_block_size(b), max_seg_s);
 
         blk_queue_max_hw_sectors(q, max_seg_s >> 9);
-        blk_queue_max_phys_segments(q, max_segments ? max_segments : MAX_PHYS_SEGMENTS);
-        blk_queue_max_hw_segments(q, max_segments ? max_segments : MAX_HW_SEGMENTS);
+        blk_queue_max_segments(q, max_segments ? max_segments : BLK_MAX_SEGMENTS);
         blk_queue_max_segment_size(q, max_seg_s);
         blk_queue_logical_block_size(q, 512);
         blk_queue_segment_boundary(q, PAGE_SIZE-1);
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index ea54ea393553..ddb4f9abd480 100644
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -956,8 +956,7 @@ static int __init pf_init(void)
                 return -ENOMEM;
         }
 
-        blk_queue_max_phys_segments(pf_queue, cluster);
-        blk_queue_max_hw_segments(pf_queue, cluster);
+        blk_queue_max_segments(pf_queue, cluster);
 
         for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++) {
                 struct gendisk *disk = pf->disk;
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 6e1daa24da2f..b72935b8f203 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -950,14 +950,14 @@ static void pkt_iosched_process_queue(struct pktcdvd_device *pd)
 static int pkt_set_segment_merging(struct pktcdvd_device *pd, struct request_queue *q)
 {
         if ((pd->settings.size << 9) / CD_FRAMESIZE
-            <= queue_max_phys_segments(q)) {
+            <= queue_max_segments(q)) {
                 /*
                  * The cdrom device can handle one segment/frame
                  */
                 clear_bit(PACKET_MERGE_SEGS, &pd->flags);
                 return 0;
         } else if ((pd->settings.size << 9) / PAGE_SIZE
-                   <= queue_max_phys_segments(q)) {
+                   <= queue_max_segments(q)) {
                 /*
                  * We can handle this case at the expense of some extra memory
                  * copies during write operations
diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c
index 9cd1a4a542b8..bc95469d33c1 100644
--- a/drivers/block/ps3disk.c
+++ b/drivers/block/ps3disk.c
@@ -482,8 +482,7 @@ static int __devinit ps3disk_probe(struct ps3_system_bus_device *_dev)
         blk_queue_ordered(queue, QUEUE_ORDERED_DRAIN_FLUSH,
                           ps3disk_prepare_flush);
 
-        blk_queue_max_phys_segments(queue, -1);
-        blk_queue_max_hw_segments(queue, -1);
+        blk_queue_max_segments(queue, -1);
         blk_queue_max_segment_size(queue, dev->bounce_size);
 
         gendisk = alloc_disk(PS3DISK_MINORS);
diff --git a/drivers/block/ps3vram.c b/drivers/block/ps3vram.c
index 6416b262934b..83ebb390b164 100644
--- a/drivers/block/ps3vram.c
+++ b/drivers/block/ps3vram.c
@@ -751,8 +751,7 @@ static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev)
         priv->queue = queue;
         queue->queuedata = dev;
         blk_queue_make_request(queue, ps3vram_make_request);
-        blk_queue_max_phys_segments(queue, MAX_PHYS_SEGMENTS);
-        blk_queue_max_hw_segments(queue, MAX_HW_SEGMENTS);
+        blk_queue_max_segments(queue, BLK_MAX_HW_SEGMENTS);
         blk_queue_max_segment_size(queue, BLK_MAX_SEGMENT_SIZE);
         blk_queue_max_hw_sectors(queue, BLK_SAFE_MAX_SECTORS);
 
diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c
index dd30cddd0f7f..48e8fee9f2d4 100644
--- a/drivers/block/sunvdc.c
+++ b/drivers/block/sunvdc.c
@@ -691,8 +691,7 @@ static int probe_disk(struct vdc_port *port)
 
         port->disk = g;
 
-        blk_queue_max_hw_segments(q, port->ring_cookies);
-        blk_queue_max_phys_segments(q, port->ring_cookies);
+        blk_queue_max_segments(q, port->ring_cookies);
         blk_queue_max_hw_sectors(q, port->max_xfer_size);
         g->major = vdc_major;
         g->first_minor = port->vio.vdev->dev_no << PARTITION_SHIFT;
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index 7bd7b2f83116..b70f0fca9a42 100644
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -1518,8 +1518,7 @@ static int carm_init_disks(struct carm_host *host)