From 2d224c0d602e7ba6b5bc7d47f6d21af48a1b5c46 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Tue, 24 Sep 2019 07:23:39 -0700 Subject: [PATCH] nvmf: simplify spdk_nvmf_subsystem_remove_ns With this change we only check the subsystem state once. Previously it did it twice, and with a different order (once PAUSED || INACTIVE, the other INACTIVE || PAUSED). Signed-off-by: Jim Harris Change-Id: Idef44accc69dccb9d161b8f04b9d5d3bbbf9e037 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/469285 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Shuhei Matsumoto --- lib/nvmf/subsystem.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/nvmf/subsystem.c b/lib/nvmf/subsystem.c index 2c939d126..e1e5658ce 100644 --- a/lib/nvmf/subsystem.c +++ b/lib/nvmf/subsystem.c @@ -899,15 +899,13 @@ spdk_nvmf_subsystem_remove_ns(struct spdk_nvmf_subsystem *subsystem, uint32_t ns struct spdk_nvmf_ns *ns; struct spdk_nvmf_registrant *reg, *reg_tmp; - assert(subsystem->state == SPDK_NVMF_SUBSYSTEM_PAUSED || - subsystem->state == SPDK_NVMF_SUBSYSTEM_INACTIVE); - - if (nsid == 0 || nsid > subsystem->max_nsid) { + if (!(subsystem->state == SPDK_NVMF_SUBSYSTEM_INACTIVE || + subsystem->state == SPDK_NVMF_SUBSYSTEM_PAUSED)) { + assert(false); return -1; } - if (!(subsystem->state == SPDK_NVMF_SUBSYSTEM_INACTIVE || - subsystem->state == SPDK_NVMF_SUBSYSTEM_PAUSED)) { + if (nsid == 0 || nsid > subsystem->max_nsid) { return -1; }