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

bdev/nvme: Remove duplicated nvme_poll_group_remove() calls

Browse Source 
spdk_nvme_ctrlr_free_io_qpair() calls spdk_nvme_poll_group_remove()
inside.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I4068a7a099a30e4fdc98e6771331ec29e1361125
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5693
Community-CI: Broadcom CI
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
Shuhei Matsumoto 2020-12-22 13:28:01 +09:00 committed by Tomasz Zawadzki
parent a7f8dc0416
commit 92d2ad357c
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -306,18 +306,6 @@ bdev_nvme_flush(struct spdk_nvme_ns *ns, struct spdk_nvme_qpair *qpair,
return 0; return 0;
} }
static void
bdev_nvme_destroy_qpair(struct nvme_io_channel *nvme_ch)
{
assert(nvme_ch->group != NULL);
if (nvme_ch->qpair != NULL) {
spdk_nvme_poll_group_remove(nvme_ch->group->group, nvme_ch->qpair);
}
spdk_nvme_ctrlr_free_io_qpair(nvme_ch->qpair);
}
static int static int
bdev_nvme_create_qpair(struct nvme_io_channel *nvme_ch) bdev_nvme_create_qpair(struct nvme_io_channel *nvme_ch)
{ {
@ -341,20 +329,18 @@ bdev_nvme_create_qpair(struct nvme_io_channel *nvme_ch)
rc = spdk_nvme_poll_group_add(nvme_ch->group->group, nvme_ch->qpair); rc = spdk_nvme_poll_group_add(nvme_ch->group->group, nvme_ch->qpair);
if (rc != 0) { if (rc != 0) {
SPDK_ERRLOG("Unable to begin polling on NVMe Channel.\n"); SPDK_ERRLOG("Unable to begin polling on NVMe Channel.\n");
goto err_pg; goto err;
} }
rc = spdk_nvme_ctrlr_connect_io_qpair(ctrlr, nvme_ch->qpair); rc = spdk_nvme_ctrlr_connect_io_qpair(ctrlr, nvme_ch->qpair);
if (rc != 0) { if (rc != 0) {
SPDK_ERRLOG("Unable to connect I/O qpair.\n"); SPDK_ERRLOG("Unable to connect I/O qpair.\n");
goto err_connect; goto err;
} }
return 0; return 0;
err_connect: err:
spdk_nvme_poll_group_remove(nvme_ch->group->group, nvme_ch->qpair);
err_pg:
spdk_nvme_ctrlr_free_io_qpair(nvme_ch->qpair); spdk_nvme_ctrlr_free_io_qpair(nvme_ch->qpair);
return rc; return rc;
@ -886,7 +872,7 @@ bdev_nvme_destroy_cb(void *io_device, void *ctx_buf)
bdev_ocssd_destroy_io_channel(nvme_ch); bdev_ocssd_destroy_io_channel(nvme_ch);
} }
bdev_nvme_destroy_qpair(nvme_ch); spdk_nvme_ctrlr_free_io_qpair(nvme_ch->qpair);
spdk_put_io_channel(spdk_io_channel_from_ctx(nvme_ch->group)); spdk_put_io_channel(spdk_io_channel_from_ctx(nvme_ch->group));
} }