Commit 5c2b5fc1 authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

bdev/nvme: fix wait_for_attach assignment 



Moved assigning ctx->start_cb_fn before it's checked for NULL to set
ctx->wait_for_attach, otherwise it was always false.

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I819d9e326dbb36f943279c3714695ae604dd64b2
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12628


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 avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
parent ef675d38

module/bdev/nvme/bdev_nvme.c

+2 −2
Original line number Diff line number Diff line
@@ -5203,14 +5203,14 @@ bdev_nvme_start_discovery(struct spdk_nvme_transport_id *trid, 
	memcpy(&ctx->bdev_opts, bdev_opts, sizeof(*bdev_opts));

	ctx->bdev_opts.from_discovery_service = true;

	ctx->calling_thread = spdk_get_thread();

	ctx->start_cb_fn = cb_fn;

	ctx->cb_ctx = cb_ctx;

	if (ctx->start_cb_fn) {

		/* We can use this when dumping json to denote if this RPC parameter

		 * was specified or not.

		 */

		ctx->wait_for_attach = true;

	}

	ctx->start_cb_fn = cb_fn;

	ctx->cb_ctx = cb_ctx;

	TAILQ_INIT(&ctx->nvm_entry_ctxs);

	TAILQ_INIT(&ctx->discovery_entry_ctxs);

	memcpy(&ctx->trid, trid, sizeof(*trid));