Commit 852357dd authored by Joel Cunningham's avatar Joel Cunningham Committed by Tomasz Zawadzki
Browse files

lib/nvmf: cleanup nvmf_ns_reservation_report signature 



Cleanups:
 - struct spdk_nvmf_ns* should be const as report is a read-only
   command.
 - Remove unused ctrlr parameter.

Change-Id: I046080039cf7b99b05c7dfcd17a1d2ca7eb61cf9
Signed-off-by: default avatarJoel Cunningham <joel.cunningham@oracle.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/26412


Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Reviewed-by: default avatarJacek Kalwas <jacek.kalwas@nutanix.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Reviewed-by: default avatarChangpeng Liu <changpeliu@tencent.com>
parent 3e3577a0

lib/nvmf/subsystem.c

+2 −3
Original line number Diff line number Diff line
@@ -3570,8 +3570,7 @@ exit: 
}



static void

nvmf_ns_reservation_report(struct spdk_nvmf_ns *ns,

			   struct spdk_nvmf_ctrlr *ctrlr,

nvmf_ns_reservation_report(const struct spdk_nvmf_ns *ns,

			   struct spdk_nvmf_request *req)

{

	struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;
@@ -3687,7 +3686,7 @@ nvmf_ns_reservation_request(void *ctx) 
		update_sgroup = nvmf_ns_reservation_release(ns, ctrlr, req);

		break;

	case SPDK_NVME_OPC_RESERVATION_REPORT:

		nvmf_ns_reservation_report(ns, ctrlr, req);

		nvmf_ns_reservation_report(ns, req);

		break;

	default:

		break;

test/unit/lib/nvmf/subsystem.c/subsystem_ut.c

+3 −4
Original line number Diff line number Diff line
@@ -1830,7 +1830,6 @@ static void 
test_nvmf_ns_reservation_report(void)

{

	struct spdk_nvmf_ns ns = {};

	struct spdk_nvmf_ctrlr ctrlr = {};

	struct spdk_nvmf_request req = {};

	union nvmf_h2c_msg cmd = {};

	union nvmf_c2h_msg rsp = {};
@@ -1861,7 +1860,7 @@ test_nvmf_ns_reservation_report(void) 
	TAILQ_INSERT_TAIL(&ns.registrants, &reg[0], link);

	TAILQ_INSERT_TAIL(&ns.registrants, &reg[1], link);



	nvmf_ns_reservation_report(&ns, &ctrlr, &req);

	nvmf_ns_reservation_report(&ns, &req);

	CU_ASSERT(req.rsp->nvme_cpl.status.sct == SPDK_NVME_SCT_GENERIC);

	CU_ASSERT(req.rsp->nvme_cpl.status.sc == SPDK_NVME_SC_SUCCESS);

	/* Get ctrlr data and status data pointers */
@@ -1888,7 +1887,7 @@ test_nvmf_ns_reservation_report(void) 
	memset(req.rsp, 0, sizeof(*req.rsp));

	cmd.nvme_cmd.cdw11_bits.resv_report.eds = false;



	nvmf_ns_reservation_report(&ns, &ctrlr, &req);

	nvmf_ns_reservation_report(&ns, &req);

	CU_ASSERT(req.rsp->nvme_cpl.status.sc == SPDK_NVME_SC_HOSTID_INCONSISTENT_FORMAT);

	CU_ASSERT(req.rsp->nvme_cpl.status.sct == SPDK_NVME_SCT_GENERIC);
@@ -1898,7 +1897,7 @@ test_nvmf_ns_reservation_report(void) 
	cmd.nvme_cmd.cdw11_bits.resv_report.eds = true;

	cmd.nvme_cmd.cdw10 = 0;



	nvmf_ns_reservation_report(&ns, &ctrlr, &req);

	nvmf_ns_reservation_report(&ns, &req);

	CU_ASSERT(req.rsp->nvme_cpl.status.sc == SPDK_NVME_SC_INTERNAL_DEVICE_ERROR);

	CU_ASSERT(req.rsp->nvme_cpl.status.sct == SPDK_NVME_SCT_GENERIC);