ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ctrlr_bdev: change spdk_nvmf_bdev_ctrlr_identify_ns to return void

Browse Source 
This function doesn't return error code

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

Reviewed-on: https://review.gerrithub.io/429441
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Piotr Pelplinski 2018-10-15 11:23:24 +02:00 committed by Ben Walker
parent 2c5b956ee5
commit ddda03ef64
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/nvmf/ctrlr.c
View File

@ -1164,7 +1164,9 @@ spdk_nvmf_ctrlr_identify_ns(struct spdk_nvmf_ctrlr *ctrlr,
return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE; 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 static int

4
lib/nvmf/ctrlr_bdev.c
View File

@ -102,7 +102,7 @@ nvmf_bdev_ctrlr_complete_cmd(struct spdk_bdev_io *bdev_io, bool success,
spdk_bdev_free_io(bdev_io); 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) spdk_nvmf_bdev_ctrlr_identify_ns(struct spdk_nvmf_ns *ns, struct spdk_nvme_ns_data *nsdata)
{ {
struct spdk_bdev *bdev = ns->bdev; 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"); SPDK_STATIC_ASSERT(sizeof(nsdata->eui64) == sizeof(ns->opts.eui64), "size mismatch");
memcpy(&nsdata->eui64, ns->opts.eui64, sizeof(nsdata->eui64)); memcpy(&nsdata->eui64, ns->opts.eui64, sizeof(nsdata->eui64));
return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;
} }
static void static void

2
lib/nvmf/nvmf_internal.h
View File

@ -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); 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); 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, int spdk_nvmf_subsystem_add_ctrlr(struct spdk_nvmf_subsystem *subsystem,
struct spdk_nvmf_ctrlr *ctrlr); struct spdk_nvmf_ctrlr *ctrlr);

4
test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c
View File

@ -144,7 +144,7 @@ ctrlr_ut_pass_msg(spdk_thread_fn fn, void *ctx, void *thread_ctx)
fn(ctx); fn(ctx);
} }
int void
spdk_nvmf_bdev_ctrlr_identify_ns(struct spdk_nvmf_ns *ns, struct spdk_nvme_ns_data *nsdata) spdk_nvmf_bdev_ctrlr_identify_ns(struct spdk_nvmf_ns *ns, struct spdk_nvme_ns_data *nsdata)
{ {
uint64_t num_blocks; 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->nlbaf = 0;
nsdata->flbas.format = 0; nsdata->flbas.format = 0;
nsdata->lbaf[0].lbads = spdk_u32log2(512); nsdata->lbaf[0].lbads = spdk_u32log2(512);
return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;
} }
static void static void