aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsrael Rukshin <[email protected]>2019-10-13 19:57:32 +0300
committerJens Axboe <[email protected]>2019-11-04 10:56:40 -0700
commit4d764bb9a92bc63afc3befe36a0bedfddff1398a (patch)
treefe404e88b1eb4c5de305808af1a4d2d68795cda1
parent58a8df67e057e979e76f8dc881766da3f7137f99 (diff)
nvmet: use bio_io_error instead of duplicating it
This commit doesn't change any logic. Signed-off-by: Israel Rukshin <[email protected]> Reviewed-by: Max Gurtovoy <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Keith Busch <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
-rw-r--r--drivers/nvme/target/io-cmd-bdev.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/nvme/target/io-cmd-bdev.c b/drivers/nvme/target/io-cmd-bdev.c
index 32008d85172b..f2618dc2ef3a 100644
--- a/drivers/nvme/target/io-cmd-bdev.c
+++ b/drivers/nvme/target/io-cmd-bdev.c
@@ -261,12 +261,10 @@ static void nvmet_bdev_execute_discard(struct nvmet_req *req)
if (bio) {
bio->bi_private = req;
bio->bi_end_io = nvmet_bio_done;
- if (status) {
- bio->bi_status = BLK_STS_IOERR;
- bio_endio(bio);
- } else {
+ if (status)
+ bio_io_error(bio);
+ else
submit_bio(bio);
- }
} else {
nvmet_req_complete(req, status);
}