block: Rename blk_queue_max_sectors to blk_queue_max_hw_sectors

The block layer calling convention is blk_queue_<limit name>.
blk_queue_max_sectors predates this practice, leading to some confusion.
Rename the function to appropriately reflect that its intended use is to
set max_hw_sectors.

Also introduce a temporary wrapper for backwards compability.  This can
be removed after the merge window is closed.

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

5 files changed, 9 insertions, 9 deletions

diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index 00435bd20699..af2d39d603c7 100644
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -177,7 +177,7 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks)
                  */
                 if (rdev->bdev->bd_disk->queue->merge_bvec_fn &&
                     queue_max_sectors(mddev->queue) > (PAGE_SIZE>>9))
-                        blk_queue_max_sectors(mddev->queue, PAGE_SIZE>>9);
+                        blk_queue_max_hw_sectors(mddev->queue, PAGE_SIZE>>9);
 
                 conf->array_sectors += rdev->sectors;
                 cnt++;
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index 32a662fc55c9..4b323f45ad74 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -308,7 +308,7 @@ static int multipath_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
                  */
                         if (q->merge_bvec_fn &&
                             queue_max_sectors(q) > (PAGE_SIZE>>9))
-                                blk_queue_max_sectors(mddev->queue, PAGE_SIZE>>9);
+                                blk_queue_max_hw_sectors(mddev->queue, PAGE_SIZE>>9);
 
                         conf->working_disks++;
                         mddev->degraded--;
@@ -478,7 +478,7 @@ static int multipath_run (mddev_t *mddev)
                  * a merge_bvec_fn to be involved in multipath */
                 if (rdev->bdev->bd_disk->queue->merge_bvec_fn &&
                     queue_max_sectors(mddev->queue) > (PAGE_SIZE>>9))
-                        blk_queue_max_sectors(mddev->queue, PAGE_SIZE>>9);
+                        blk_queue_max_hw_sectors(mddev->queue, PAGE_SIZE>>9);
 
                 if (!test_bit(Faulty, &rdev->flags))
                         conf->working_disks++;
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 77605cdceaf1..a1f7147b757f 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -182,7 +182,7 @@ static int create_strip_zones(mddev_t *mddev)
 
                 if (rdev1->bdev->bd_disk->queue->merge_bvec_fn &&
                     queue_max_sectors(mddev->queue) > (PAGE_SIZE>>9))
-                        blk_queue_max_sectors(mddev->queue, PAGE_SIZE>>9);
+                        blk_queue_max_hw_sectors(mddev->queue, PAGE_SIZE>>9);
 
                 if (!smallest || (rdev1->sectors < smallest->sectors))
                         smallest = rdev1;
@@ -325,7 +325,7 @@ static int raid0_run(mddev_t *mddev)
         }
         if (md_check_no_bitmap(mddev))
                 return -EINVAL;
-        blk_queue_max_sectors(mddev->queue, mddev->chunk_sectors);
+        blk_queue_max_hw_sectors(mddev->queue, mddev->chunk_sectors);
         mddev->queue->queue_lock = &mddev->queue->__queue_lock;
 
         ret = create_strip_zones(mddev);
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 859bd3ffe435..5a06122abd3b 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1158,7 +1158,7 @@ static int raid1_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
                          */
                         if (rdev->bdev->bd_disk->queue->merge_bvec_fn &&
                             queue_max_sectors(mddev->queue) > (PAGE_SIZE>>9))
-                                blk_queue_max_sectors(mddev->queue, PAGE_SIZE>>9);
+                                blk_queue_max_hw_sectors(mddev->queue, PAGE_SIZE>>9);
 
                         p->head_position = 0;
                         rdev->raid_disk = mirror;
@@ -2103,7 +2103,7 @@ static int run(mddev_t *mddev)
                  */
                 if (rdev->bdev->bd_disk->queue->merge_bvec_fn &&
                     queue_max_sectors(mddev->queue) > (PAGE_SIZE>>9))
-                        blk_queue_max_sectors(mddev->queue, PAGE_SIZE>>9);
+                        blk_queue_max_hw_sectors(mddev->queue, PAGE_SIZE>>9);
         }
 
         mddev->degraded = 0;
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index d119b7b75e71..7584f9ab9bcf 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1161,7 +1161,7 @@ static int raid10_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
                          */
                         if (rdev->bdev->bd_disk->queue->merge_bvec_fn &&
                             queue_max_sectors(mddev->queue) > (PAGE_SIZE>>9))
-                                blk_queue_max_sectors(mddev->queue, PAGE_SIZE>>9);
+                                blk_queue_max_hw_sectors(mddev->queue, PAGE_SIZE>>9);
 
                         p->head_position = 0;
                         rdev->raid_disk = mirror;
@@ -2260,7 +2260,7 @@ static int run(mddev_t *mddev)
                  */
                 if (rdev->bdev->bd_disk->queue->merge_bvec_fn &&
                     queue_max_sectors(mddev->queue) > (PAGE_SIZE>>9))
-                        blk_queue_max_sectors(mddev->queue, PAGE_SIZE>>9);
+                        blk_queue_max_hw_sectors(mddev->queue, PAGE_SIZE>>9);
 
                 disk->head_position = 0;
         }