From 5c2b5fc14ba29ced5be25c35c07745c674c76c7e Mon Sep 17 00:00:00 2001 From: Konrad Sztyber Date: Wed, 11 May 2022 13:26:01 +0200 Subject: [PATCH] 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: Konrad Sztyber Change-Id: I819d9e326dbb36f943279c3714695ae604dd64b2 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12628 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Aleksey Marchuk --- module/bdev/nvme/bdev_nvme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c index 1e174ce68..1dc95bdac 100644 --- a/module/bdev/nvme/bdev_nvme.c +++ b/module/bdev/nvme/bdev_nvme.c @@ -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));