Skip to content

Commit 453daec

Browse files
Chaitanya Kulkarniaxboe
authored andcommitted
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: Chaitanya Kulkarni <kch@nvidia.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 38d12f1 commit 453daec

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

block/blk-lib.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,14 @@ struct bio *blk_alloc_discard_bio(struct block_device *bdev,
6060
return bio;
6161
}
6262

63-
int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
63+
void __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
6464
sector_t nr_sects, gfp_t gfp_mask, struct bio **biop)
6565
{
6666
struct bio *bio;
6767

6868
while ((bio = blk_alloc_discard_bio(bdev, &sector, &nr_sects,
6969
gfp_mask)))
7070
*biop = bio_chain_and_submit(*biop, bio);
71-
return 0;
7271
}
7372
EXPORT_SYMBOL(__blkdev_issue_discard);
7473

include/linux/blkdev.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1259,7 +1259,7 @@ extern void blk_io_schedule(void);
12591259

12601260
int blkdev_issue_discard(struct block_device *bdev, sector_t sector,
12611261
sector_t nr_sects, gfp_t gfp_mask);
1262-
int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
1262+
void __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
12631263
sector_t nr_sects, gfp_t gfp_mask, struct bio **biop);
12641264
int blkdev_issue_secure_erase(struct block_device *bdev, sector_t sector,
12651265
sector_t nr_sects, gfp_t gfp);

0 commit comments

Comments
 (0)