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>

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 352ea24d66e8..2e889838e819 100644
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -2320,8 +2320,7 @@ static int ub_probe_lun(struct ub_dev *sc, int lnum)
         disk->queue = q;
 
         blk_queue_bounce_limit(q, BLK_BOUNCE_HIGH);
-        blk_queue_max_hw_segments(q, UB_MAX_REQ_SG);
-        blk_queue_max_phys_segments(q, UB_MAX_REQ_SG);
+        blk_queue_max_segments(q, UB_MAX_REQ_SG);
         blk_queue_segment_boundary(q, 0xffffffff);      /* Dubious. */
         blk_queue_max_hw_sectors(q, UB_MAX_SECTORS);
         blk_queue_logical_block_size(q, lun->capacity.bsize);