Commit 3f190fe1 authored by Seth Howell's avatar Seth Howell Committed by Tomasz Zawadzki
Browse files

nvmf/subsystem: find intermediate state in helper function. 



This will be used in another place later.

This patch is part of a series aimed at improving recovery
when we are fail to change the subsystem state.

Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Change-Id: I24bfbeb3d006584003164540d6ede540dbcafa86
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3392


Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatar <dongx.yi@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarMichael Haeuptle <michaelhaeuptle@gmail.com>
parent dca3fdc4

lib/nvmf/nvmf_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ enum spdk_nvmf_subsystem_state { 
	SPDK_NVMF_SUBSYSTEM_PAUSED,

	SPDK_NVMF_SUBSYSTEM_RESUMING,

	SPDK_NVMF_SUBSYSTEM_DEACTIVATING,

	SPDK_NVMF_SUBSYSTEM_NUM_STATES,

};



struct spdk_nvmf_tgt {

lib/nvmf/subsystem.c

+27 −16
Original line number Diff line number Diff line
@@ -370,6 +370,31 @@ spdk_nvmf_subsystem_destroy(struct spdk_nvmf_subsystem *subsystem) 
	free(subsystem);

}





/* we have to use the typedef in the function declaration to appease astyle. */

typedef enum spdk_nvmf_subsystem_state spdk_nvmf_subsystem_state_t;



static spdk_nvmf_subsystem_state_t

nvmf_subsystem_get_intermediate_state(enum spdk_nvmf_subsystem_state current_state,

				      enum spdk_nvmf_subsystem_state requested_state)

{

	switch (requested_state) {

	case SPDK_NVMF_SUBSYSTEM_INACTIVE:

		return SPDK_NVMF_SUBSYSTEM_DEACTIVATING;

	case SPDK_NVMF_SUBSYSTEM_ACTIVE:

		if (current_state == SPDK_NVMF_SUBSYSTEM_PAUSED) {

			return SPDK_NVMF_SUBSYSTEM_RESUMING;

		} else {

			return SPDK_NVMF_SUBSYSTEM_ACTIVATING;

		}

	case SPDK_NVMF_SUBSYSTEM_PAUSED:

		return SPDK_NVMF_SUBSYSTEM_PAUSING;

	default:

		assert(false);

		return SPDK_NVMF_SUBSYSTEM_NUM_STATES;

	}

}



static int

nvmf_subsystem_set_state(struct spdk_nvmf_subsystem *subsystem,

			 enum spdk_nvmf_subsystem_state state)
@@ -500,22 +525,8 @@ nvmf_subsystem_state_change(struct spdk_nvmf_subsystem *subsystem, 
	enum spdk_nvmf_subsystem_state intermediate_state;

	int rc;



	switch (requested_state) {

	case SPDK_NVMF_SUBSYSTEM_INACTIVE:

		intermediate_state = SPDK_NVMF_SUBSYSTEM_DEACTIVATING;

		break;

	case SPDK_NVMF_SUBSYSTEM_ACTIVE:

		if (subsystem->state == SPDK_NVMF_SUBSYSTEM_PAUSED) {

			intermediate_state = SPDK_NVMF_SUBSYSTEM_RESUMING;

		} else {

			intermediate_state = SPDK_NVMF_SUBSYSTEM_ACTIVATING;

		}

		break;

	case SPDK_NVMF_SUBSYSTEM_PAUSED:

		intermediate_state = SPDK_NVMF_SUBSYSTEM_PAUSING;

		break;

	default:

		assert(false);

	intermediate_state = nvmf_subsystem_get_intermediate_state(subsystem->state, requested_state);

	if (intermediate_state == SPDK_NVMF_SUBSYSTEM_NUM_STATES) {

		return -EINVAL;

	}