Commit ddda03ef authored by Piotr Pelplinski's avatar Piotr Pelplinski Committed by Ben Walker
Browse files

ctrlr_bdev: change spdk_nvmf_bdev_ctrlr_identify_ns to return void 



This function doesn't return error code

Signed-off-by: default avatarPiotr Pelplinski <piotr.pelplinski@intel.com>
Change-Id: I67a8fa7393990470e509baa8934e78bc6f6a6c9e

Reviewed-on: https://review.gerrithub.io/429441


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 2c5b956e

lib/nvmf/ctrlr.c

+3 −1
Original line number Diff line number Diff line
@@ -1164,7 +1164,9 @@ spdk_nvmf_ctrlr_identify_ns(struct spdk_nvmf_ctrlr *ctrlr, 
		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	return spdk_nvmf_bdev_ctrlr_identify_ns(ns, nsdata);

	spdk_nvmf_bdev_ctrlr_identify_ns(ns, nsdata);



	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}



static int

lib/nvmf/ctrlr_bdev.c

+1 −3
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ nvmf_bdev_ctrlr_complete_cmd(struct spdk_bdev_io *bdev_io, bool success, 
	spdk_bdev_free_io(bdev_io);

}



int

void

spdk_nvmf_bdev_ctrlr_identify_ns(struct spdk_nvmf_ns *ns, struct spdk_nvme_ns_data *nsdata)

{

	struct spdk_bdev *bdev = ns->bdev;
@@ -124,8 +124,6 @@ spdk_nvmf_bdev_ctrlr_identify_ns(struct spdk_nvmf_ns *ns, struct spdk_nvme_ns_da 


	SPDK_STATIC_ASSERT(sizeof(nsdata->eui64) == sizeof(ns->opts.eui64), "size mismatch");

	memcpy(&nsdata->eui64, ns->opts.eui64, sizeof(nsdata->eui64));



	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}



static void

lib/nvmf/nvmf_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ bool spdk_nvmf_ctrlr_dsm_supported(struct spdk_nvmf_ctrlr *ctrlr); 
bool spdk_nvmf_ctrlr_write_zeroes_supported(struct spdk_nvmf_ctrlr *ctrlr);

void spdk_nvmf_ctrlr_ns_changed(struct spdk_nvmf_ctrlr *ctrlr, uint32_t nsid);



int spdk_nvmf_bdev_ctrlr_identify_ns(struct spdk_nvmf_ns *ns, struct spdk_nvme_ns_data *nsdata);

void spdk_nvmf_bdev_ctrlr_identify_ns(struct spdk_nvmf_ns *ns, struct spdk_nvme_ns_data *nsdata);



int spdk_nvmf_subsystem_add_ctrlr(struct spdk_nvmf_subsystem *subsystem,

				  struct spdk_nvmf_ctrlr *ctrlr);

test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c

+1 −3
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ ctrlr_ut_pass_msg(spdk_thread_fn fn, void *ctx, void *thread_ctx) 
	fn(ctx);

}



int

void

spdk_nvmf_bdev_ctrlr_identify_ns(struct spdk_nvmf_ns *ns, struct spdk_nvme_ns_data *nsdata)

{

	uint64_t num_blocks;
@@ -157,8 +157,6 @@ spdk_nvmf_bdev_ctrlr_identify_ns(struct spdk_nvmf_ns *ns, struct spdk_nvme_ns_da 
	nsdata->nlbaf = 0;

	nsdata->flbas.format = 0;

	nsdata->lbaf[0].lbads = spdk_u32log2(512);



	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}



static void