Commit e91d7428 authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

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: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Ic14b251fbd7da1519ad0fd4d8a183d6b6ca17984

Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9468


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 avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 7c4a2454

lib/nvme/nvme_ctrlr.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

	}