Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba5d7385 authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

block: cleanup __blkdev_issue_discard() 



Cleanup __blkdev_issue_discard() a bit:

- remove local variable of 'end_sect'
- remove code block of 'fail'

Cc: Mike Snitzer <snitzer@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Xiao Ni <xni@redhat.com>
Cc: Mariusz Dabrowski <mariusz.dabrowski@intel.com>
Tested-by: default avatarRui Salvaterra <rsalvaterra@gmail.com>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 1adfc5e4

block/blk-lib.c

+6 −17
Original line number Diff line number Diff line
@@ -51,15 +51,12 @@ 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;

		req_sects = min(req_sects, bio_allowed_max_sectors(q));

	if (!nr_sects)

		return -EINVAL;



		end_sect = sector + req_sects;

	while (nr_sects) {

		unsigned int req_sects = min_t(unsigned int, nr_sects,

				bio_allowed_max_sectors(q));



		bio = blk_next_bio(bio, 0, gfp_mask);

		bio->bi_iter.bi_sector = sector;
@@ -67,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
@@ -81,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);