1 files changed, 8 insertions, 18 deletions

diff --git a/block/blk-lib.c b/block/blk-lib.c
index 76f867ea9a9b..5f2c429d4378 100644
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
@@ -51,16 +51,14 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
         if ((sector | nr_sects) & bs_mask)
                 return -EINVAL;
 
-        while (nr_sects) {
-                unsigned int req_sects = nr_sects;
-                sector_t end_sect;
+        if (!nr_sects)
+                return -EINVAL;
 
-                if (!req_sects)
-                        goto fail;
-                if (req_sects > UINT_MAX >> 9)
-                        req_sects = UINT_MAX >> 9;
+        while (nr_sects) {
+                sector_t req_sects = min_t(sector_t, nr_sects,
+                                bio_allowed_max_sectors(q));
 
-                end_sect = sector + req_sects;
+                WARN_ON_ONCE((req_sects << 9) > UINT_MAX);
 
                 bio = blk_next_bio(bio, 0, gfp_mask);
                 bio->bi_iter.bi_sector = sector;
@@ -68,8 +66,8 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
                 bio_set_op_attrs(bio, op, 0);
 
                 bio->bi_iter.bi_size = req_sects << 9;
+                sector += req_sects;
                 nr_sects -= req_sects;
-                sector = end_sect;
 
                 /*
                  * We can loop for a long time in here, if someone does
@@ -82,14 +80,6 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
 
         *biop = bio;
         return 0;
-
-fail:
-        if (bio) {
-                submit_bio_wait(bio);
-                bio_put(bio);
-        }
-        *biop = NULL;
-        return -EOPNOTSUPP;
 }
 EXPORT_SYMBOL(__blkdev_issue_discard);
 
@@ -161,7 +151,7 @@ static int __blkdev_issue_write_same(struct block_device *bdev, sector_t sector,
                 return -EOPNOTSUPP;
 
         /* Ensure that max_write_same_sectors doesn't overflow bi_size */
-        max_write_same_sectors = UINT_MAX >> 9;
+        max_write_same_sectors = bio_allowed_max_sectors(q);
 
         while (nr_sects) {
                 bio = blk_next_bio(bio, 1, gfp_mask);