Commit 8de19363 authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Jim Harris
Browse files

nvmf: move subsystem_state_change_ctx to nvmf_internal.h 



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


Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent 20764873

lib/nvmf/nvmf_internal.h

+11 −0
Original line number Diff line number Diff line
@@ -255,6 +255,17 @@ struct spdk_nvmf_ctrlr { 


#define NVMF_MAX_LISTENERS_PER_SUBSYSTEM	16



struct nvmf_subsystem_state_change_ctx {

	struct spdk_nvmf_subsystem		*subsystem;

	uint16_t				nsid;



	enum spdk_nvmf_subsystem_state		original_state;

	enum spdk_nvmf_subsystem_state		requested_state;



	spdk_nvmf_subsystem_state_change_done	cb_fn;

	void					*cb_arg;

};



struct spdk_nvmf_subsystem {

	struct spdk_thread				*thread;

lib/nvmf/subsystem.c

+6 −17
Original line number Diff line number Diff line
@@ -563,19 +563,8 @@ nvmf_subsystem_set_state(struct spdk_nvmf_subsystem *subsystem, 
	return actual_old_state - expected_old_state;

}



struct subsystem_state_change_ctx {

	struct spdk_nvmf_subsystem		*subsystem;

	uint16_t				nsid;



	enum spdk_nvmf_subsystem_state		original_state;

	enum spdk_nvmf_subsystem_state		requested_state;



	spdk_nvmf_subsystem_state_change_done	cb_fn;

	void					*cb_arg;

};



static void

nvmf_subsystem_state_change_complete(struct subsystem_state_change_ctx *ctx, int status)

nvmf_subsystem_state_change_complete(struct nvmf_subsystem_state_change_ctx *ctx, int status)

{

	struct spdk_nvmf_subsystem *subsystem = ctx->subsystem;
@@ -590,7 +579,7 @@ nvmf_subsystem_state_change_complete(struct subsystem_state_change_ctx *ctx, int 
static void

subsystem_state_change_revert_done(struct spdk_io_channel_iter *i, int status)

{

	struct subsystem_state_change_ctx *ctx = spdk_io_channel_iter_get_ctx(i);

	struct nvmf_subsystem_state_change_ctx *ctx = spdk_io_channel_iter_get_ctx(i);



	/* Nothing to be done here if the state setting fails, we are just screwed. */

	if (nvmf_subsystem_set_state(ctx->subsystem, ctx->requested_state)) {
@@ -604,7 +593,7 @@ subsystem_state_change_revert_done(struct spdk_io_channel_iter *i, int status) 
static void

subsystem_state_change_done(struct spdk_io_channel_iter *i, int status)

{

	struct subsystem_state_change_ctx *ctx = spdk_io_channel_iter_get_ctx(i);

	struct nvmf_subsystem_state_change_ctx *ctx = spdk_io_channel_iter_get_ctx(i);

	enum spdk_nvmf_subsystem_state intermediate_state;



	SPDK_DTRACE_PROBE4(nvmf_subsystem_change_state_done, ctx->subsystem->subnqn,
@@ -641,7 +630,7 @@ static void 
subsystem_state_change_continue(void *ctx, int status)

{

	struct spdk_io_channel_iter *i = ctx;

	struct subsystem_state_change_ctx *_ctx __attribute__((unused));

	struct nvmf_subsystem_state_change_ctx *_ctx __attribute__((unused));



	_ctx = spdk_io_channel_iter_get_ctx(i);

	SPDK_DTRACE_PROBE3(nvmf_pg_change_state_done, _ctx->subsystem->subnqn,
@@ -653,7 +642,7 @@ subsystem_state_change_continue(void *ctx, int status) 
static void

subsystem_state_change_on_pg(struct spdk_io_channel_iter *i)

{

	struct subsystem_state_change_ctx *ctx;

	struct nvmf_subsystem_state_change_ctx *ctx;

	struct spdk_io_channel *ch;

	struct spdk_nvmf_poll_group *group;
@@ -691,7 +680,7 @@ nvmf_subsystem_state_change(struct spdk_nvmf_subsystem *subsystem, 
			    spdk_nvmf_subsystem_state_change_done cb_fn,

			    void *cb_arg)

{

	struct subsystem_state_change_ctx *ctx;

	struct nvmf_subsystem_state_change_ctx *ctx;

	enum spdk_nvmf_subsystem_state intermediate_state;

	int rc;