From e91d7428f9968d9e208b1994cc67a71e597abf6d Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Fri, 10 Sep 2021 01:10:35 -0700 Subject: [PATCH] nvme: print name of ctrlr state in timeout message Previously the nvme_ctrlr_state_string() function was only defined for DEBUG builds since it was only used in DEBUGLOGs. So now that we're also using it for an ERRLOG we need to define this function in release builds as well. Signed-off-by: Jim Harris Change-Id: Ic14b251fbd7da1519ad0fd4d8a183d6b6ca17984 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9468 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Tomasz Zawadzki --- lib/nvme/nvme_ctrlr.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/nvme/nvme_ctrlr.c b/lib/nvme/nvme_ctrlr.c index ff705a45f..55e6c8368 100644 --- a/lib/nvme/nvme_ctrlr.c +++ b/lib/nvme/nvme_ctrlr.c @@ -1213,7 +1213,6 @@ nvme_ctrlr_disable(struct spdk_nvme_ctrlr *ctrlr) return 0; } -#ifdef DEBUG static const char * nvme_ctrlr_state_string(enum nvme_ctrlr_state state) { @@ -1299,7 +1298,6 @@ nvme_ctrlr_state_string(enum nvme_ctrlr_state state) } return "unknown"; }; -#endif /* DEBUG */ static void nvme_ctrlr_set_state(struct spdk_nvme_ctrlr *ctrlr, enum nvme_ctrlr_state state, @@ -3642,7 +3640,8 @@ init_timeout: */ if (ctrlr->state_timeout_tsc != NVME_TIMEOUT_INFINITE && ticks > ctrlr->state_timeout_tsc) { - NVME_CTRLR_ERRLOG(ctrlr, "Initialization timed out in state %d\n", ctrlr->state); + NVME_CTRLR_ERRLOG(ctrlr, "Initialization timed out in state %d (%s)\n", + ctrlr->state, nvme_ctrlr_state_string(ctrlr->state)); return -1; }