Commit 5f76f79c authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

nvmf: keep ZONE_APPEND with other commands in effects log 



That way, all commands are listed in the same place.  Also, while here
move the checks for ZONE_APPEND support out of the offset check to avoid
one level of indentation.

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


Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
parent 415a0d2b

lib/nvmf/ctrlr.c

+7 −6
Original line number Diff line number Diff line
@@ -2521,6 +2521,8 @@ static const struct spdk_nvme_cmds_and_effect_log_page g_cmds_and_effect_log_pag 
		[SPDK_NVME_OPC_ZONE_MGMT_SEND]		= {1, 1, 0, 0, 0, 0, 0, 0},

		/* ZONE MANAGEMENT RECEIVE */

		[SPDK_NVME_OPC_ZONE_MGMT_RECV]		= {1, 0, 0, 0, 0, 0, 0, 0},

		/* ZONE APPEND */

		[SPDK_NVME_OPC_ZONE_APPEND]		= {1, 1, 0, 0, 0, 0, 0, 0},

		/* COPY */

		[SPDK_NVME_OPC_COPY]			= {1, 1, 0, 0, 0, 0, 0, 0},

	},
@@ -2533,16 +2535,15 @@ nvmf_get_cmds_and_effects_log_page(struct spdk_nvmf_ctrlr *ctrlr, struct iovec * 
	uint32_t page_size = sizeof(struct spdk_nvme_cmds_and_effect_log_page);

	size_t copy_len = 0;

	struct spdk_nvme_cmds_and_effect_log_page cmds_and_effect_log_page = g_cmds_and_effect_log_page;

	struct spdk_nvme_cmds_and_effect_entry csupp_and_lbcc_effect_entry = {1, 1, 0, 0, 0, 0, 0, 0};

	struct spdk_nvme_cmds_and_effect_entry zero = {};

	struct spdk_iov_xfer ix;



	spdk_iov_xfer_init(&ix, iovs, iovcnt);

	if (!nvmf_subsystem_zone_append_supported(ctrlr->subsys)) {

		cmds_and_effect_log_page.io_cmds_supported[SPDK_NVME_OPC_ZONE_APPEND] = zero;

	}



	spdk_iov_xfer_init(&ix, iovs, iovcnt);

	if (offset < page_size) {

		if (nvmf_subsystem_zone_append_supported(ctrlr->subsys)) {

			cmds_and_effect_log_page.io_cmds_supported[SPDK_NVME_OPC_ZONE_APPEND] =

				csupp_and_lbcc_effect_entry;

		}

		copy_len = spdk_min(page_size - offset, length);

		spdk_iov_xfer_from_buf(&ix, (char *)(&cmds_and_effect_log_page) + offset, copy_len);

	}