Commit c937fab3 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jim Harris
Browse files

nvme: use uint32_t consistently for NSID values 



A few places were accidentally storing namespace IDs in uint16_t.

Change-Id: Iae9d709fb20bc1ac0a584ccd9683b721ce5de961
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/403886


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 8d8f4ac3

examples/nvme/reserve/reserve.c

+4 −4
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ reservation_ns_completion(void *cb_arg, const struct spdk_nvme_cpl *cpl) 


static int

reservation_ns_register(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair,

			uint16_t ns_id)

			uint32_t ns_id)

{

	int ret;

	struct spdk_nvme_reservation_register_data rr_data;
@@ -165,7 +165,7 @@ reservation_ns_register(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *q 
}



static int

reservation_ns_report(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair, uint16_t ns_id)

reservation_ns_report(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair, uint32_t ns_id)

{

	int ret, i;

	uint8_t *payload;
@@ -222,7 +222,7 @@ reservation_ns_report(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpa 
}



static int

reservation_ns_acquire(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair, uint16_t ns_id)

reservation_ns_acquire(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair, uint32_t ns_id)

{

	int ret;

	struct spdk_nvme_reservation_acquire_data cdata;
@@ -258,7 +258,7 @@ reservation_ns_acquire(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qp 
}



static int

reservation_ns_release(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair, uint16_t ns_id)

reservation_ns_release(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair, uint32_t ns_id)

{

	int ret;

	struct spdk_nvme_reservation_key_data cdata;

lib/nvme/nvme_ctrlr_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ nvme_ctrlr_cmd_identify_controller(struct spdk_nvme_ctrlr *ctrlr, void *payload, 
}



int

nvme_ctrlr_cmd_identify_namespace(struct spdk_nvme_ctrlr *ctrlr, uint16_t nsid,

nvme_ctrlr_cmd_identify_namespace(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid,

				  void *payload, spdk_nvme_cmd_cb cb_fn, void *cb_arg)

{

	struct nvme_request *req;

lib/nvme/nvme_internal.h

+3 −3
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ struct spdk_nvme_ns { 
	uint32_t			pi_type;

	uint32_t			sectors_per_max_io;

	uint32_t			sectors_per_stripe;

	uint16_t			id;

	uint32_t			id;

	uint16_t			flags;

};
@@ -528,7 +528,7 @@ int nvme_ctrlr_cmd_identify_controller(struct spdk_nvme_ctrlr *ctrlr, 
		void *payload,

		spdk_nvme_cmd_cb cb_fn, void *cb_arg);

int	nvme_ctrlr_cmd_identify_namespace(struct spdk_nvme_ctrlr *ctrlr,

		uint16_t nsid, void *payload,

		uint32_t nsid, void *payload,

		spdk_nvme_cmd_cb cb_fn, void *cb_arg);

int	nvme_ctrlr_cmd_set_num_queues(struct spdk_nvme_ctrlr *ctrlr,

				      uint32_t num_queues, spdk_nvme_cmd_cb cb_fn,
@@ -589,7 +589,7 @@ void nvme_qpair_disable(struct spdk_nvme_qpair *qpair); 
int	nvme_qpair_submit_request(struct spdk_nvme_qpair *qpair,

				  struct nvme_request *req);



int	nvme_ns_construct(struct spdk_nvme_ns *ns, uint16_t id,

int	nvme_ns_construct(struct spdk_nvme_ns *ns, uint32_t id,

			  struct spdk_nvme_ctrlr *ctrlr);

void	nvme_ns_destruct(struct spdk_nvme_ns *ns);

lib/nvme/nvme_ns.c

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ spdk_nvme_ns_get_optimal_io_boundary(struct spdk_nvme_ns *ns) 
	return ns->sectors_per_stripe;

}



int nvme_ns_construct(struct spdk_nvme_ns *ns, uint16_t id,

int nvme_ns_construct(struct spdk_nvme_ns *ns, uint32_t id,

		      struct spdk_nvme_ctrlr *ctrlr)

{

	assert(id > 0);

test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ nvme_ns_destruct(struct spdk_nvme_ns *ns) 
}



int

nvme_ns_construct(struct spdk_nvme_ns *ns, uint16_t id,

nvme_ns_construct(struct spdk_nvme_ns *ns, uint32_t id,

		  struct spdk_nvme_ctrlr *ctrlr)

{

	return 0;