ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bdev/nvme: don't check spdk_nvme_ctrlr_free_io_qpair return

Browse Source 
spdk_nvme_ctrlr_free_io_qpair now always returns 0, so
update the code to account for that.

Fixes issue #2012.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I61c78459472573adbfeb28052ae3379d7880567c
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8660
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Ziye Yang <ziye.yang@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Jim Harris 2021-07-05 17:53:13 +00:00 committed by Tomasz Zawadzki
parent 4246e79c04
commit 109af0bcb3
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
module/bdev/nvme/bdev_nvme.c
View File

@ -432,20 +432,13 @@ err:
return rc; return rc;
} }
static int static void
bdev_nvme_destroy_qpair(struct nvme_io_path *io_path) bdev_nvme_destroy_qpair(struct nvme_io_path *io_path)
{ {
int rc; if (io_path->qpair != NULL) {
spdk_nvme_ctrlr_free_io_qpair(io_path->qpair);
if (io_path->qpair == NULL) {
return 0;
}
rc = spdk_nvme_ctrlr_free_io_qpair(io_path->qpair);
if (!rc) {
io_path->qpair = NULL; io_path->qpair = NULL;
} }
return rc;
} }
static void static void
@ -621,11 +614,9 @@ _bdev_nvme_reset_destroy_qpair(struct spdk_io_channel_iter *i)
{ {
struct spdk_io_channel *ch = spdk_io_channel_iter_get_channel(i); struct spdk_io_channel *ch = spdk_io_channel_iter_get_channel(i);
struct nvme_io_path *io_path = spdk_io_channel_get_ctx(ch); struct nvme_io_path *io_path = spdk_io_channel_get_ctx(ch);
int rc;
rc = bdev_nvme_destroy_qpair(io_path); bdev_nvme_destroy_qpair(io_path);
spdk_for_each_channel_continue(i, 0);
spdk_for_each_channel_continue(i, rc);
} }
static int static int