Commit 453daece authored by Chaitanya Kulkarni's avatar Chaitanya Kulkarni Committed by Jens Axboe
Browse files

block: change return type to void 



Now that all the callers of __blkdev_issue_discard() have been changed
to ignore its return value, change its return type from int to void.

Signed-off-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 38d12f15

block/blk-lib.c

+1 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ struct bio *blk_alloc_discard_bio(struct block_device *bdev, 
	return bio;

}



int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,

void __blkdev_issue_discard(struct block_device *bdev, sector_t sector,

		sector_t nr_sects, gfp_t gfp_mask, struct bio **biop)

{

	struct bio *bio;
@@ -68,7 +68,6 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector, 
	while ((bio = blk_alloc_discard_bio(bdev, &sector, &nr_sects,

			gfp_mask)))

		*biop = bio_chain_and_submit(*biop, bio);

	return 0;

}

EXPORT_SYMBOL(__blkdev_issue_discard);

include/linux/blkdev.h

+1 −1
Original line number Diff line number Diff line
@@ -1259,7 +1259,7 @@ extern void blk_io_schedule(void); 


int blkdev_issue_discard(struct block_device *bdev, sector_t sector,

		sector_t nr_sects, gfp_t gfp_mask);

int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,

void __blkdev_issue_discard(struct block_device *bdev, sector_t sector,

		sector_t nr_sects, gfp_t gfp_mask, struct bio **biop);

int blkdev_issue_secure_erase(struct block_device *bdev, sector_t sector,

		sector_t nr_sects, gfp_t gfp);