Commit 38d12f15 authored by Chaitanya Kulkarni's avatar Chaitanya Kulkarni Committed by Jens Axboe
Browse files

nvmet: ignore discard return value 



__blkdev_issue_discard() always returns 0, making the error checking
in nvmet_bdev_discard_range() dead code.

Kill the function nvmet_bdev_discard_range() and call
__blkdev_issue_discard() directly from nvmet_bdev_execute_discard(),
since no error handling is needed anymore for __blkdev_issue_discard()
call.

Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 699fcfb6

drivers/nvme/target/io-cmd-bdev.c

+7 −21
Original line number Diff line number Diff line
@@ -363,29 +363,14 @@ u16 nvmet_bdev_flush(struct nvmet_req *req) 
	return 0;

}



static u16 nvmet_bdev_discard_range(struct nvmet_req *req,

		struct nvme_dsm_range *range, struct bio **bio)

{

	struct nvmet_ns *ns = req->ns;

	int ret;



	ret = __blkdev_issue_discard(ns->bdev,

			nvmet_lba_to_sect(ns, range->slba),

			le32_to_cpu(range->nlb) << (ns->blksize_shift - 9),

			GFP_KERNEL, bio);

	if (ret && ret != -EOPNOTSUPP) {

		req->error_slba = le64_to_cpu(range->slba);

		return errno_to_nvme_status(req, ret);

	}

	return NVME_SC_SUCCESS;

}



static void nvmet_bdev_execute_discard(struct nvmet_req *req)

{

	struct nvmet_ns *ns = req->ns;

	struct nvme_dsm_range range;

	struct bio *bio = NULL;

	sector_t nr_sects;

	int i;

	u16 status;

	u16 status = NVME_SC_SUCCESS;



	for (i = 0; i <= le32_to_cpu(req->cmd->dsm.nr); i++) {

		status = nvmet_copy_from_sgl(req, i * sizeof(range), &range,
@@ -393,9 +378,10 @@ static void nvmet_bdev_execute_discard(struct nvmet_req *req) 
		if (status)

			break;



		status = nvmet_bdev_discard_range(req, &range, &bio);

		if (status)

			break;

		nr_sects = le32_to_cpu(range.nlb) << (ns->blksize_shift - 9);

		__blkdev_issue_discard(ns->bdev,

				nvmet_lba_to_sect(ns, range.slba), nr_sects,

				GFP_KERNEL, &bio);

	}



	if (bio) {