[PATCH 2/3] block: cleanup __blkdev_issue_discard()
From: Ming Lei <hidden>
Date: 2018-10-26 06:24:34
Subsystem:
block layer, the rest · Maintainers:
Jens Axboe, Linus Torvalds
Cleanup __blkdev_issue_discard(). Cc: Rui Salvaterra <redacted> Cc: Mike Snitzer <redacted> Cc: Christoph Hellwig <hch@lst.de> Cc: Xiao Ni <redacted> Cc: Mariusz Dabrowski <redacted> Signed-off-by: Ming Lei <redacted> --- block/blk-lib.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/block/blk-lib.c b/block/blk-lib.c
index aa3944946b2f..93011785f710 100644
--- a/block/blk-lib.c
+++ b/block/blk-lib.c@@ -52,16 +52,11 @@ 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 (!req_sects) - goto fail; - if (req_sects > UINT_MAX >> 9) - req_sects = (UINT_MAX >> 9) & ~bs_mask; + if (!nr_sects) + return -EINVAL; - end_sect = sector + req_sects; + while (nr_sects) { + unsigned int req_sects = min(nr_sects, (UINT_MAX >> 9) & ~bs_mask); bio = next_bio(bio, 0, gfp_mask); bio->bi_iter.bi_sector = sector;
@@ -69,8 +64,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
@@ -83,14 +78,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);
--
2.9.5