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

bdev/nvme: Remove duplicated nvme_poll_group_remove() calls 



spdk_nvme_ctrlr_free_io_qpair() calls spdk_nvme_poll_group_remove()
inside.

Signed-off-by: default avatarShuhei 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: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent a7f8dc04

module/bdev/nvme/bdev_nvme.c

+4 −18
Original line number Diff line number Diff line
@@ -306,18 +306,6 @@ bdev_nvme_flush(struct spdk_nvme_ns *ns, struct spdk_nvme_qpair *qpair, 
	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

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

	if (rc != 0) {

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

	if (rc != 0) {

		SPDK_ERRLOG("Unable to connect I/O qpair.\n");

		goto err_connect;

		goto err;

	}



	return 0;



err_connect:

	spdk_nvme_poll_group_remove(nvme_ch->group->group, nvme_ch->qpair);

err_pg:

err:

	spdk_nvme_ctrlr_free_io_qpair(nvme_ch->qpair);



	return rc;
@@ -886,7 +872,7 @@ bdev_nvme_destroy_cb(void *io_device, void *ctx_buf) 
		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));

}