Commit d7c7fbcd authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

bdev/nvme: Inline bdev_nvme_io_complete() into bdev_nvme_reset_io_complete() 



Even when I/O retry is supported, reset will not be retried. However,
bdev_nvme_io_complete() will process I/O retry. Hence inline
bdev_nvme_io_complete() into bdev_nvme_reset_io_complete() to exclude
reset from I/O retry. The result of reset is success or failure, so omit
the -ENOMEM case.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I667e74cbbac4a13cefb6896f898476ba48bcd0fa
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9687


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent d278711c

module/bdev/nvme/bdev_nvme.c

+8 −1
Original line number Diff line number Diff line
@@ -1096,8 +1096,15 @@ static void 
bdev_nvme_reset_io_complete(void *cb_arg, int rc)

{

	struct nvme_bdev_io *bio = cb_arg;

	enum spdk_bdev_io_status io_status;



	if (rc == 0) {

		io_status = SPDK_BDEV_IO_STATUS_SUCCESS;

	} else {

		io_status = SPDK_BDEV_IO_STATUS_FAILED;

	}



	bdev_nvme_io_complete(bio, rc);

	spdk_bdev_io_complete(spdk_bdev_io_from_ctx(bio), io_status);

}



static int