Skip to content

Commit 7d09a8e

Browse files
ChaitanayaKulkarniaxboe
authored andcommitted
block: ignore __blkdev_issue_discard() return value
__blkdev_issue_discard() always returns 0, making the error check in blkdev_issue_discard() dead code. In function blkdev_issue_discard() initialize ret = 0, remove ret assignment from __blkdev_issue_discard(), rely on bio == NULL check to call submit_bio_wait(), preserve submit_bio_wait() error handling, and preserve -EOPNOTSUPP to 0 mapping. Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Chaitanya Kulkarni <ckulkarnilinux@gmail.com> Reviewed-by: Anuj Gupta <anuj20.g@samsung.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 3a64c46 commit 7d09a8e

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

block/blk-lib.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector,
8787
{
8888
struct bio *bio = NULL;
8989
struct blk_plug plug;
90-
int ret;
90+
int ret = 0;
9191

9292
blk_start_plug(&plug);
93-
ret = __blkdev_issue_discard(bdev, sector, nr_sects, gfp_mask, &bio);
94-
if (!ret && bio) {
93+
__blkdev_issue_discard(bdev, sector, nr_sects, gfp_mask, &bio);
94+
if (bio) {
9595
ret = submit_bio_wait(bio);
9696
if (ret == -EOPNOTSUPP)
9797
ret = 0;

0 commit comments

Comments
 (0)