From: Israel Rukshin <israelr@mellanox.com>

Date: Sun, 13 Oct 2019 19:57:32 +0300

Subject: [PATCH] nvmet: use bio_io_error instead of duplicating it

Git-commit: 4d764bb9a92bc63afc3befe36a0bedfddff1398a

Patch-mainline: v5.5-rc1

References: bsc#1169045

This commit doesn't change any logic.

Signed-off-by: Israel Rukshin <israelr@mellanox.com>

Reviewed-by: Max Gurtovoy <maxg@mellanox.com>

Reviewed-by: Christoph Hellwig <hch@lst.de>

Signed-off-by: Keith Busch <kbusch@kernel.org>

Signed-off-by: Jens Axboe <axboe@kernel.dk>

Acked-by: Hannes Reinecke <hare@suse.com>

---

 drivers/nvme/target/io-cmd-bdev.c | 8 +++-----

 1 file 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);

 	}

-- 

2.16.4