Skip to content

Commit f4412c7

Browse files
ChaitanayaKulkarniMikulas Patocka
authored andcommitted
dm: ignore discard return value
__blkdev_issue_discard() always returns 0, making all error checking at call sites dead code. For dm-thin change issue_discard() return type to void, in passdown_double_checking_shared_status() remove the r assignment from return value of the issue_discard(), for end_discard() hardcode value of r to 0 that matches only value returned from __blkdev_issue_discard(). Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Chaitanya Kulkarni <ckulkarnilinux@gmail.com> Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
1 parent 20f85a1 commit f4412c7

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

drivers/md/dm-thin.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -395,13 +395,13 @@ static void begin_discard(struct discard_op *op, struct thin_c *tc, struct bio *
395395
op->bio = NULL;
396396
}
397397

398-
static int issue_discard(struct discard_op *op, dm_block_t data_b, dm_block_t data_e)
398+
static void issue_discard(struct discard_op *op, dm_block_t data_b, dm_block_t data_e)
399399
{
400400
struct thin_c *tc = op->tc;
401401
sector_t s = block_to_sectors(tc->pool, data_b);
402402
sector_t len = block_to_sectors(tc->pool, data_e - data_b);
403403

404-
return __blkdev_issue_discard(tc->pool_dev->bdev, s, len, GFP_NOIO, &op->bio);
404+
__blkdev_issue_discard(tc->pool_dev->bdev, s, len, GFP_NOIO, &op->bio);
405405
}
406406

407407
static void end_discard(struct discard_op *op, int r)
@@ -1113,9 +1113,7 @@ static void passdown_double_checking_shared_status(struct dm_thin_new_mapping *m
11131113
break;
11141114
}
11151115

1116-
r = issue_discard(&op, b, e);
1117-
if (r)
1118-
goto out;
1116+
issue_discard(&op, b, e);
11191117

11201118
b = e;
11211119
}
@@ -1188,8 +1186,8 @@ static void process_prepared_discard_passdown_pt1(struct dm_thin_new_mapping *m)
11881186
struct discard_op op;
11891187

11901188
begin_discard(&op, tc, discard_parent);
1191-
r = issue_discard(&op, m->data_block, data_end);
1192-
end_discard(&op, r);
1189+
issue_discard(&op, m->data_block, data_end);
1190+
end_discard(&op, 0);
11931191
}
11941192
}
11951193

0 commit comments

Comments
 (0)