module/bdev_nvme: remove spdk prefix from static/internal functions.
Signed-off-by: Seth Howell <seth.howell@intel.com> Change-Id: Iad8b672463c80abe1f13efc486bed0f88bccef21 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2329 Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com> Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Seth Howell
Tomasz Zawadzki
parent
d4f4fd45cf
commit
b95421d48e
@ -195,7 +195,7 @@ static config_json_namespace_fn g_config_json_namespace_fn[] = {
|
||||
};
|
||||
|
||||
struct spdk_nvme_qpair *
|
||||
spdk_bdev_nvme_get_io_qpair(struct spdk_io_channel *ctrlr_io_ch)
|
||||
bdev_nvme_get_io_qpair(struct spdk_io_channel *ctrlr_io_ch)
|
||||
{
|
||||
struct nvme_io_channel *nvme_ch;
|
||||
|
||||
@ -1120,7 +1120,7 @@ probe_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid,
|
||||
}
|
||||
|
||||
static void
|
||||
spdk_nvme_abort_cpl(void *ctx, const struct spdk_nvme_cpl *cpl)
|
||||
nvme_abort_cpl(void *ctx, const struct spdk_nvme_cpl *cpl)
|
||||
{
|
||||
struct spdk_nvme_ctrlr *ctrlr = ctx;
|
||||
struct nvme_bdev_ctrlr *nvme_bdev_ctrlr;
|
||||
@ -1156,7 +1156,7 @@ timeout_cb(void *cb_arg, struct spdk_nvme_ctrlr *ctrlr,
|
||||
case SPDK_BDEV_NVME_TIMEOUT_ACTION_ABORT:
|
||||
if (qpair) {
|
||||
rc = spdk_nvme_ctrlr_cmd_abort(ctrlr, qpair, cid,
|
||||
spdk_nvme_abort_cpl, ctrlr);
|
||||
nvme_abort_cpl, ctrlr);
|
||||
if (rc == 0) {
|
||||
return;
|
||||
}
|
||||
@ -1539,13 +1539,13 @@ bdev_nvme_hotplug(void *arg)
|
||||
}
|
||||
|
||||
void
|
||||
spdk_bdev_nvme_get_opts(struct spdk_bdev_nvme_opts *opts)
|
||||
bdev_nvme_get_opts(struct spdk_bdev_nvme_opts *opts)
|
||||
{
|
||||
*opts = g_opts;
|
||||
}
|
||||
|
||||
int
|
||||
spdk_bdev_nvme_set_opts(const struct spdk_bdev_nvme_opts *opts)
|
||||
bdev_nvme_set_opts(const struct spdk_bdev_nvme_opts *opts)
|
||||
{
|
||||
if (g_bdev_nvme_init_thread != NULL) {
|
||||
if (!TAILQ_EMPTY(&g_nvme_bdev_ctrlrs)) {
|
||||
@ -1585,7 +1585,7 @@ set_nvme_hotplug_period_cb(void *_ctx)
|
||||
}
|
||||
|
||||
int
|
||||
spdk_bdev_nvme_set_hotplug(bool enabled, uint64_t period_us, spdk_msg_fn cb, void *cb_ctx)
|
||||
bdev_nvme_set_hotplug(bool enabled, uint64_t period_us, spdk_msg_fn cb, void *cb_ctx)
|
||||
{
|
||||
struct set_nvme_hotplug_ctx *ctx;
|
||||
|
||||
@ -1700,15 +1700,15 @@ bdev_nvme_async_poll(void *arg)
|
||||
}
|
||||
|
||||
int
|
||||
spdk_bdev_nvme_create(struct spdk_nvme_transport_id *trid,
|
||||
struct spdk_nvme_host_id *hostid,
|
||||
const char *base_name,
|
||||
const char **names,
|
||||
uint32_t count,
|
||||
const char *hostnqn,
|
||||
uint32_t prchk_flags,
|
||||
spdk_bdev_create_nvme_fn cb_fn,
|
||||
void *cb_ctx)
|
||||
bdev_nvme_create(struct spdk_nvme_transport_id *trid,
|
||||
struct spdk_nvme_host_id *hostid,
|
||||
const char *base_name,
|
||||
const char **names,
|
||||
uint32_t count,
|
||||
const char *hostnqn,
|
||||
uint32_t prchk_flags,
|
||||
spdk_bdev_create_nvme_fn cb_fn,
|
||||
void *cb_ctx)
|
||||
{
|
||||
struct nvme_probe_skip_entry *entry, *tmp;
|
||||
struct nvme_async_probe_ctx *ctx;
|
||||
@ -1772,7 +1772,7 @@ spdk_bdev_nvme_create(struct spdk_nvme_transport_id *trid,
|
||||
}
|
||||
|
||||
int
|
||||
spdk_bdev_nvme_delete(const char *name)
|
||||
bdev_nvme_delete(const char *name)
|
||||
{
|
||||
struct nvme_bdev_ctrlr *nvme_bdev_ctrlr = NULL;
|
||||
struct nvme_probe_skip_entry *entry;
|
||||
@ -2004,7 +2004,7 @@ bdev_nvme_library_init(void)
|
||||
}
|
||||
}
|
||||
|
||||
rc = spdk_bdev_nvme_set_hotplug(hotplug_enabled, hotplug_period, NULL, NULL);
|
||||
rc = bdev_nvme_set_hotplug(hotplug_enabled, hotplug_period, NULL, NULL);
|
||||
if (rc) {
|
||||
SPDK_ERRLOG("Failed to setup hotplug (%d): %s", rc, spdk_strerror(rc));
|
||||
rc = -1;
|
||||
@ -2813,7 +2813,7 @@ bdev_nvme_config_json(struct spdk_json_write_ctx *w)
|
||||
}
|
||||
|
||||
struct spdk_nvme_ctrlr *
|
||||
spdk_bdev_nvme_get_ctrlr(struct spdk_bdev *bdev)
|
||||
bdev_nvme_get_ctrlr(struct spdk_bdev *bdev)
|
||||
{
|
||||
if (!bdev || bdev->module != &nvme_if) {
|
||||
return NULL;
|
||||
|
||||
@ -62,21 +62,21 @@ struct spdk_bdev_nvme_opts {
|
||||
bool delay_cmd_submit;
|
||||
};
|
||||
|
||||
struct spdk_nvme_qpair *spdk_bdev_nvme_get_io_qpair(struct spdk_io_channel *ctrlr_io_ch);
|
||||
void spdk_bdev_nvme_get_opts(struct spdk_bdev_nvme_opts *opts);
|
||||
int spdk_bdev_nvme_set_opts(const struct spdk_bdev_nvme_opts *opts);
|
||||
int spdk_bdev_nvme_set_hotplug(bool enabled, uint64_t period_us, spdk_msg_fn cb, void *cb_ctx);
|
||||
struct spdk_nvme_qpair *bdev_nvme_get_io_qpair(struct spdk_io_channel *ctrlr_io_ch);
|
||||
void bdev_nvme_get_opts(struct spdk_bdev_nvme_opts *opts);
|
||||
int bdev_nvme_set_opts(const struct spdk_bdev_nvme_opts *opts);
|
||||
int bdev_nvme_set_hotplug(bool enabled, uint64_t period_us, spdk_msg_fn cb, void *cb_ctx);
|
||||
|
||||
int spdk_bdev_nvme_create(struct spdk_nvme_transport_id *trid,
|
||||
struct spdk_nvme_host_id *hostid,
|
||||
const char *base_name,
|
||||
const char **names,
|
||||
uint32_t count,
|
||||
const char *hostnqn,
|
||||
uint32_t prchk_flags,
|
||||
spdk_bdev_create_nvme_fn cb_fn,
|
||||
void *cb_ctx);
|
||||
struct spdk_nvme_ctrlr *spdk_bdev_nvme_get_ctrlr(struct spdk_bdev *bdev);
|
||||
int bdev_nvme_create(struct spdk_nvme_transport_id *trid,
|
||||
struct spdk_nvme_host_id *hostid,
|
||||
const char *base_name,
|
||||
const char **names,
|
||||
uint32_t count,
|
||||
const char *hostnqn,
|
||||
uint32_t prchk_flags,
|
||||
spdk_bdev_create_nvme_fn cb_fn,
|
||||
void *cb_ctx);
|
||||
struct spdk_nvme_ctrlr *bdev_nvme_get_ctrlr(struct spdk_bdev *bdev);
|
||||
|
||||
/**
|
||||
* Delete NVMe controller with all bdevs on top of it.
|
||||
@ -85,6 +85,6 @@ struct spdk_nvme_ctrlr *spdk_bdev_nvme_get_ctrlr(struct spdk_bdev *bdev);
|
||||
* \param name NVMe controller name
|
||||
* \return zero on success, -EINVAL on wrong parameters or -ENODEV if controller is not found
|
||||
*/
|
||||
int spdk_bdev_nvme_delete(const char *name);
|
||||
int bdev_nvme_delete(const char *name);
|
||||
|
||||
#endif /* SPDK_BDEV_NVME_H */
|
||||
|
||||
@ -57,8 +57,8 @@ static const struct spdk_json_object_decoder rpc_nvme_cuse_register_decoders[] =
|
||||
};
|
||||
|
||||
static void
|
||||
spdk_rpc_nvme_cuse_register(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
rpc_nvme_cuse_register(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
{
|
||||
struct rpc_nvme_cuse_register req = {};
|
||||
struct spdk_json_write_ctx *w;
|
||||
@ -95,7 +95,7 @@ spdk_rpc_nvme_cuse_register(struct spdk_jsonrpc_request *request,
|
||||
cleanup:
|
||||
free_rpc_nvme_cuse_register(&req);
|
||||
}
|
||||
SPDK_RPC_REGISTER("bdev_nvme_cuse_register", spdk_rpc_nvme_cuse_register, SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER("bdev_nvme_cuse_register", rpc_nvme_cuse_register, SPDK_RPC_RUNTIME)
|
||||
|
||||
struct rpc_nvme_cuse_unregister {
|
||||
char *name;
|
||||
@ -112,8 +112,8 @@ static const struct spdk_json_object_decoder rpc_nvme_cuse_unregister_decoders[]
|
||||
};
|
||||
|
||||
static void
|
||||
spdk_rpc_nvme_cuse_unregister(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
rpc_nvme_cuse_unregister(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
{
|
||||
struct rpc_nvme_cuse_unregister req = {};
|
||||
struct spdk_json_write_ctx *w;
|
||||
@ -149,4 +149,4 @@ spdk_rpc_nvme_cuse_unregister(struct spdk_jsonrpc_request *request,
|
||||
cleanup:
|
||||
free_rpc_nvme_cuse_unregister(&req);
|
||||
}
|
||||
SPDK_RPC_REGISTER("bdev_nvme_cuse_unregister", spdk_rpc_nvme_cuse_unregister, SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER("bdev_nvme_cuse_unregister", rpc_nvme_cuse_unregister, SPDK_RPC_RUNTIME)
|
||||
|
||||
@ -87,14 +87,14 @@ static const struct spdk_json_object_decoder rpc_bdev_nvme_options_decoders[] =
|
||||
};
|
||||
|
||||
static void
|
||||
spdk_rpc_bdev_nvme_set_options(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
rpc_bdev_nvme_set_options(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
{
|
||||
struct spdk_bdev_nvme_opts opts;
|
||||
struct spdk_json_write_ctx *w;
|
||||
int rc;
|
||||
|
||||
spdk_bdev_nvme_get_opts(&opts);
|
||||
bdev_nvme_get_opts(&opts);
|
||||
if (params && spdk_json_decode_object(params, rpc_bdev_nvme_options_decoders,
|
||||
SPDK_COUNTOF(rpc_bdev_nvme_options_decoders),
|
||||
&opts)) {
|
||||
@ -104,7 +104,7 @@ spdk_rpc_bdev_nvme_set_options(struct spdk_jsonrpc_request *request,
|
||||
return;
|
||||
}
|
||||
|
||||
rc = spdk_bdev_nvme_set_opts(&opts);
|
||||
rc = bdev_nvme_set_opts(&opts);
|
||||
if (rc) {
|
||||
spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc));
|
||||
return;
|
||||
@ -116,7 +116,7 @@ spdk_rpc_bdev_nvme_set_options(struct spdk_jsonrpc_request *request,
|
||||
|
||||
return;
|
||||
}
|
||||
SPDK_RPC_REGISTER("bdev_nvme_set_options", spdk_rpc_bdev_nvme_set_options,
|
||||
SPDK_RPC_REGISTER("bdev_nvme_set_options", rpc_bdev_nvme_set_options,
|
||||
SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_nvme_set_options, set_bdev_nvme_options)
|
||||
|
||||
@ -141,8 +141,8 @@ rpc_bdev_nvme_set_hotplug_done(void *ctx)
|
||||
}
|
||||
|
||||
static void
|
||||
spdk_rpc_bdev_nvme_set_hotplug(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
rpc_bdev_nvme_set_hotplug(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
{
|
||||
struct rpc_bdev_nvme_hotplug req = {false, 0};
|
||||
int rc;
|
||||
@ -154,8 +154,8 @@ spdk_rpc_bdev_nvme_set_hotplug(struct spdk_jsonrpc_request *request,
|
||||
goto invalid;
|
||||
}
|
||||
|
||||
rc = spdk_bdev_nvme_set_hotplug(req.enabled, req.period_us, rpc_bdev_nvme_set_hotplug_done,
|
||||
request);
|
||||
rc = bdev_nvme_set_hotplug(req.enabled, req.period_us, rpc_bdev_nvme_set_hotplug_done,
|
||||
request);
|
||||
if (rc) {
|
||||
goto invalid;
|
||||
}
|
||||
@ -164,7 +164,7 @@ spdk_rpc_bdev_nvme_set_hotplug(struct spdk_jsonrpc_request *request,
|
||||
invalid:
|
||||
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_strerror(-rc));
|
||||
}
|
||||
SPDK_RPC_REGISTER("bdev_nvme_set_hotplug", spdk_rpc_bdev_nvme_set_hotplug, SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER("bdev_nvme_set_hotplug", rpc_bdev_nvme_set_hotplug, SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_nvme_set_hotplug, set_bdev_nvme_hotplug)
|
||||
|
||||
struct rpc_bdev_nvme_attach_controller {
|
||||
@ -224,7 +224,7 @@ struct rpc_bdev_nvme_attach_controller_ctx {
|
||||
};
|
||||
|
||||
static void
|
||||
spdk_rpc_bdev_nvme_attach_controller_done(void *cb_ctx, size_t bdev_count, int rc)
|
||||
rpc_bdev_nvme_attach_controller_done(void *cb_ctx, size_t bdev_count, int rc)
|
||||
{
|
||||
struct rpc_bdev_nvme_attach_controller_ctx *ctx = cb_ctx;
|
||||
struct spdk_jsonrpc_request *request = ctx->request;
|
||||
@ -250,8 +250,8 @@ exit:
|
||||
}
|
||||
|
||||
static void
|
||||
spdk_rpc_bdev_nvme_attach_controller(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
rpc_bdev_nvme_attach_controller(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
{
|
||||
struct rpc_bdev_nvme_attach_controller_ctx *ctx;
|
||||
struct spdk_nvme_transport_id trid = {};
|
||||
@ -334,8 +334,8 @@ spdk_rpc_bdev_nvme_attach_controller(struct spdk_jsonrpc_request *request,
|
||||
|
||||
ctx->request = request;
|
||||
ctx->count = NVME_MAX_BDEVS_PER_RPC;
|
||||
rc = spdk_bdev_nvme_create(&trid, &hostid, ctx->req.name, ctx->names, ctx->count, ctx->req.hostnqn,
|
||||
prchk_flags, spdk_rpc_bdev_nvme_attach_controller_done, ctx);
|
||||
rc = bdev_nvme_create(&trid, &hostid, ctx->req.name, ctx->names, ctx->count, ctx->req.hostnqn,
|
||||
prchk_flags, rpc_bdev_nvme_attach_controller_done, ctx);
|
||||
if (rc) {
|
||||
spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc));
|
||||
goto cleanup;
|
||||
@ -347,13 +347,13 @@ cleanup:
|
||||
free_rpc_bdev_nvme_attach_controller(&ctx->req);
|
||||
free(ctx);
|
||||
}
|
||||
SPDK_RPC_REGISTER("bdev_nvme_attach_controller", spdk_rpc_bdev_nvme_attach_controller,
|
||||
SPDK_RPC_REGISTER("bdev_nvme_attach_controller", rpc_bdev_nvme_attach_controller,
|
||||
SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_nvme_attach_controller, construct_nvme_bdev)
|
||||
|
||||
static void
|
||||
spdk_rpc_dump_nvme_controller_info(struct spdk_json_write_ctx *w,
|
||||
struct nvme_bdev_ctrlr *nvme_bdev_ctrlr)
|
||||
rpc_dump_nvme_controller_info(struct spdk_json_write_ctx *w,
|
||||
struct nvme_bdev_ctrlr *nvme_bdev_ctrlr)
|
||||
{
|
||||
struct spdk_nvme_transport_id *trid;
|
||||
|
||||
@ -394,8 +394,8 @@ static const struct spdk_json_object_decoder rpc_bdev_nvme_get_controllers_decod
|
||||
};
|
||||
|
||||
static void
|
||||
spdk_rpc_bdev_nvme_get_controllers(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
rpc_bdev_nvme_get_controllers(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
{
|
||||
struct rpc_bdev_nvme_get_controllers req = {};
|
||||
struct spdk_json_write_ctx *w;
|
||||
@ -423,10 +423,10 @@ spdk_rpc_bdev_nvme_get_controllers(struct spdk_jsonrpc_request *request,
|
||||
spdk_json_write_array_begin(w);
|
||||
|
||||
if (ctrlr != NULL) {
|
||||
spdk_rpc_dump_nvme_controller_info(w, ctrlr);
|
||||
rpc_dump_nvme_controller_info(w, ctrlr);
|
||||
} else {
|
||||
for (ctrlr = nvme_bdev_first_ctrlr(); ctrlr; ctrlr = nvme_bdev_next_ctrlr(ctrlr)) {
|
||||
spdk_rpc_dump_nvme_controller_info(w, ctrlr);
|
||||
rpc_dump_nvme_controller_info(w, ctrlr);
|
||||
}
|
||||
}
|
||||
|
||||
@ -437,7 +437,7 @@ spdk_rpc_bdev_nvme_get_controllers(struct spdk_jsonrpc_request *request,
|
||||
cleanup:
|
||||
free_rpc_bdev_nvme_get_controllers(&req);
|
||||
}
|
||||
SPDK_RPC_REGISTER("bdev_nvme_get_controllers", spdk_rpc_bdev_nvme_get_controllers, SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER("bdev_nvme_get_controllers", rpc_bdev_nvme_get_controllers, SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_nvme_get_controllers, get_nvme_controllers)
|
||||
|
||||
struct rpc_bdev_nvme_detach_controller {
|
||||
@ -455,8 +455,8 @@ static const struct spdk_json_object_decoder rpc_bdev_nvme_detach_controller_dec
|
||||
};
|
||||
|
||||
static void
|
||||
spdk_rpc_bdev_nvme_detach_controller(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
rpc_bdev_nvme_detach_controller(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
{
|
||||
struct rpc_bdev_nvme_detach_controller req = {NULL};
|
||||
struct spdk_json_write_ctx *w;
|
||||
@ -470,7 +470,7 @@ spdk_rpc_bdev_nvme_detach_controller(struct spdk_jsonrpc_request *request,
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
rc = spdk_bdev_nvme_delete(req.name);
|
||||
rc = bdev_nvme_delete(req.name);
|
||||
if (rc != 0) {
|
||||
spdk_jsonrpc_send_error_response(request, rc, spdk_strerror(-rc));
|
||||
goto cleanup;
|
||||
@ -483,7 +483,7 @@ spdk_rpc_bdev_nvme_detach_controller(struct spdk_jsonrpc_request *request,
|
||||
cleanup:
|
||||
free_rpc_bdev_nvme_detach_controller(&req);
|
||||
}
|
||||
SPDK_RPC_REGISTER("bdev_nvme_detach_controller", spdk_rpc_bdev_nvme_detach_controller,
|
||||
SPDK_RPC_REGISTER("bdev_nvme_detach_controller", rpc_bdev_nvme_detach_controller,
|
||||
SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_nvme_detach_controller, delete_nvme_controller)
|
||||
|
||||
@ -654,8 +654,8 @@ apply_firmware_complete(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg
|
||||
}
|
||||
|
||||
static void
|
||||
spdk_rpc_bdev_nvme_apply_firmware(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
rpc_bdev_nvme_apply_firmware(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
{
|
||||
int rc;
|
||||
int fd = -1;
|
||||
@ -703,7 +703,7 @@ spdk_rpc_bdev_nvme_apply_firmware(struct spdk_jsonrpc_request *request,
|
||||
return;
|
||||
}
|
||||
|
||||
if ((ctrlr = spdk_bdev_nvme_get_ctrlr(bdev)) == NULL) {
|
||||
if ((ctrlr = bdev_nvme_get_ctrlr(bdev)) == NULL) {
|
||||
snprintf(msg, sizeof(msg), "Controller information for %s were not found.",
|
||||
firm_ctx->req->bdev_name);
|
||||
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, msg);
|
||||
@ -714,7 +714,7 @@ spdk_rpc_bdev_nvme_apply_firmware(struct spdk_jsonrpc_request *request,
|
||||
|
||||
for (bdev2 = spdk_bdev_first(); bdev2; bdev2 = spdk_bdev_next(bdev2)) {
|
||||
|
||||
if (spdk_bdev_nvme_get_ctrlr(bdev2) != ctrlr) {
|
||||
if (bdev_nvme_get_ctrlr(bdev2) != ctrlr) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@ -838,5 +838,5 @@ spdk_rpc_bdev_nvme_apply_firmware(struct spdk_jsonrpc_request *request,
|
||||
return;
|
||||
}
|
||||
}
|
||||
SPDK_RPC_REGISTER("bdev_nvme_apply_firmware", spdk_rpc_bdev_nvme_apply_firmware, SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER("bdev_nvme_apply_firmware", rpc_bdev_nvme_apply_firmware, SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_nvme_apply_firmware, apply_nvme_firmware)
|
||||
|
||||
@ -121,8 +121,8 @@ rpc_bdev_nvme_send_cmd_resp_construct(struct rpc_bdev_nvme_send_cmd_resp *resp,
|
||||
}
|
||||
|
||||
static void
|
||||
spdk_rpc_bdev_nvme_send_cmd_complete(struct rpc_bdev_nvme_send_cmd_ctx *ctx,
|
||||
const struct spdk_nvme_cpl *cpl)
|
||||
rpc_bdev_nvme_send_cmd_complete(struct rpc_bdev_nvme_send_cmd_ctx *ctx,
|
||||
const struct spdk_nvme_cpl *cpl)
|
||||
{
|
||||
struct spdk_jsonrpc_request *request = ctx->jsonrpc_request;
|
||||
struct spdk_json_write_ctx *w;
|
||||
@ -165,7 +165,7 @@ nvme_rpc_bdev_nvme_cb(void *ref, const struct spdk_nvme_cpl *cpl)
|
||||
ctx->ctrlr_io_ch = NULL;
|
||||
}
|
||||
|
||||
spdk_rpc_bdev_nvme_send_cmd_complete(ctx, cpl);
|
||||
rpc_bdev_nvme_send_cmd_complete(ctx, cpl);
|
||||
}
|
||||
|
||||
static int
|
||||
@ -191,7 +191,7 @@ nvme_rpc_io_cmd_bdev_nvme(struct rpc_bdev_nvme_send_cmd_ctx *ctx, struct spdk_nv
|
||||
int ret;
|
||||
|
||||
ctx->ctrlr_io_ch = spdk_get_io_channel(_nvme_ctrlr->ctrlr);
|
||||
io_qpair = spdk_bdev_nvme_get_io_qpair(ctx->ctrlr_io_ch);
|
||||
io_qpair = bdev_nvme_get_io_qpair(ctx->ctrlr_io_ch);
|
||||
|
||||
ret = spdk_nvme_ctrlr_cmd_io_raw_with_md(_nvme_ctrlr->ctrlr, io_qpair,
|
||||
cmd, buf, nbytes, md_buf, nvme_rpc_bdev_nvme_cb, ctx);
|
||||
@ -441,8 +441,8 @@ static const struct spdk_json_object_decoder rpc_bdev_nvme_send_cmd_req_decoders
|
||||
};
|
||||
|
||||
static void
|
||||
spdk_rpc_bdev_nvme_send_cmd(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
rpc_bdev_nvme_send_cmd(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
{
|
||||
struct rpc_bdev_nvme_send_cmd_ctx *ctx;
|
||||
int ret, error_code;
|
||||
@ -488,5 +488,5 @@ invalid:
|
||||
free_rpc_bdev_nvme_send_cmd_ctx(ctx);
|
||||
return;
|
||||
}
|
||||
SPDK_RPC_REGISTER("bdev_nvme_send_cmd", spdk_rpc_bdev_nvme_send_cmd, SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER("bdev_nvme_send_cmd", rpc_bdev_nvme_send_cmd, SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_nvme_send_cmd, send_nvme_cmd)
|
||||
|
||||
@ -139,7 +139,7 @@ vbdev_opal_delete_all_base_config(struct vbdev_opal_part_base *base)
|
||||
}
|
||||
|
||||
static int
|
||||
vbdev_opal_destruct(void *ctx)
|
||||
_vbdev_opal_destruct(void *ctx)
|
||||
{
|
||||
struct spdk_bdev_part *part = ctx;
|
||||
|
||||
@ -228,7 +228,7 @@ vbdev_opal_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_
|
||||
}
|
||||
|
||||
struct spdk_opal_locking_range_info *
|
||||
spdk_vbdev_opal_get_info_from_bdev(const char *opal_bdev_name, const char *password)
|
||||
vbdev_opal_get_info_from_bdev(const char *opal_bdev_name, const char *password)
|
||||
{
|
||||
struct opal_vbdev *vbdev;
|
||||
struct nvme_bdev_ctrlr *nvme_ctrlr;
|
||||
@ -300,7 +300,7 @@ vbdev_opal_io_type_supported(void *ctx, enum spdk_bdev_io_type io_type)
|
||||
}
|
||||
|
||||
static struct spdk_bdev_fn_table opal_vbdev_fn_table = {
|
||||
.destruct = vbdev_opal_destruct,
|
||||
.destruct = _vbdev_opal_destruct,
|
||||
.submit_request = vbdev_opal_submit_request,
|
||||
.io_type_supported = vbdev_opal_io_type_supported,
|
||||
.dump_info_json = vbdev_opal_dump_info_json,
|
||||
@ -326,8 +326,8 @@ vbdev_opal_free_bdev(struct opal_vbdev *opal_bdev)
|
||||
}
|
||||
|
||||
int
|
||||
spdk_vbdev_opal_create(const char *nvme_ctrlr_name, uint32_t nsid, uint8_t locking_range_id,
|
||||
uint64_t range_start, uint64_t range_length, const char *password)
|
||||
vbdev_opal_create(const char *nvme_ctrlr_name, uint32_t nsid, uint8_t locking_range_id,
|
||||
uint64_t range_start, uint64_t range_length, const char *password)
|
||||
{
|
||||
int rc;
|
||||
char *opal_vbdev_name;
|
||||
@ -496,7 +496,7 @@ vbdev_opal_destruct_bdev(struct opal_vbdev *opal_bdev)
|
||||
}
|
||||
|
||||
int
|
||||
spdk_vbdev_opal_destruct(const char *bdev_name, const char *password)
|
||||
vbdev_opal_destruct(const char *bdev_name, const char *password)
|
||||
{
|
||||
struct spdk_vbdev_opal_config *cfg;
|
||||
struct nvme_bdev_ctrlr *nvme_ctrlr;
|
||||
@ -557,8 +557,8 @@ vbdev_opal_examine(struct spdk_bdev *bdev)
|
||||
}
|
||||
|
||||
int
|
||||
spdk_vbdev_opal_set_lock_state(const char *bdev_name, uint16_t user_id, const char *password,
|
||||
const char *lock_state)
|
||||
vbdev_opal_set_lock_state(const char *bdev_name, uint16_t user_id, const char *password,
|
||||
const char *lock_state)
|
||||
{
|
||||
struct nvme_bdev_ctrlr *nvme_ctrlr;
|
||||
int locking_range_id;
|
||||
@ -605,8 +605,8 @@ spdk_vbdev_opal_set_lock_state(const char *bdev_name, uint16_t user_id, const ch
|
||||
}
|
||||
|
||||
int
|
||||
spdk_vbdev_opal_enable_new_user(const char *bdev_name, const char *admin_password, uint16_t user_id,
|
||||
const char *user_password)
|
||||
vbdev_opal_enable_new_user(const char *bdev_name, const char *admin_password, uint16_t user_id,
|
||||
const char *user_password)
|
||||
{
|
||||
struct nvme_bdev_ctrlr *nvme_ctrlr;
|
||||
int locking_range_id;
|
||||
|
||||
@ -37,18 +37,18 @@
|
||||
#include "bdev_nvme.h"
|
||||
#include "common.h"
|
||||
|
||||
int spdk_vbdev_opal_create(const char *nvme_ctrlr_name, uint32_t nsid, uint8_t locking_range_id,
|
||||
uint64_t range_start, uint64_t range_length, const char *password);
|
||||
int vbdev_opal_create(const char *nvme_ctrlr_name, uint32_t nsid, uint8_t locking_range_id,
|
||||
uint64_t range_start, uint64_t range_length, const char *password);
|
||||
|
||||
struct spdk_opal_locking_range_info *spdk_vbdev_opal_get_info_from_bdev(const char *opal_bdev_name,
|
||||
struct spdk_opal_locking_range_info *vbdev_opal_get_info_from_bdev(const char *opal_bdev_name,
|
||||
const char *password);
|
||||
|
||||
int spdk_vbdev_opal_destruct(const char *bdev_name, const char *password);
|
||||
int vbdev_opal_destruct(const char *bdev_name, const char *password);
|
||||
|
||||
int spdk_vbdev_opal_enable_new_user(const char *bdev_name, const char *admin_password,
|
||||
uint16_t user_id, const char *user_password);
|
||||
int vbdev_opal_enable_new_user(const char *bdev_name, const char *admin_password,
|
||||
uint16_t user_id, const char *user_password);
|
||||
|
||||
int spdk_vbdev_opal_set_lock_state(const char *bdev_name, uint16_t user_id, const char *password,
|
||||
const char *lock_state);
|
||||
int vbdev_opal_set_lock_state(const char *bdev_name, uint16_t user_id, const char *password,
|
||||
const char *lock_state);
|
||||
|
||||
#endif
|
||||
|
||||
@ -56,8 +56,8 @@ static const struct spdk_json_object_decoder rpc_bdev_nvme_opal_init_decoders[]
|
||||
};
|
||||
|
||||
static void
|
||||
spdk_rpc_bdev_nvme_opal_init(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
rpc_bdev_nvme_opal_init(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
{
|
||||
struct rpc_bdev_nvme_opal_init req = {};
|
||||
struct spdk_json_write_ctx *w;
|
||||
@ -115,7 +115,7 @@ spdk_rpc_bdev_nvme_opal_init(struct spdk_jsonrpc_request *request,
|
||||
out:
|
||||
free_rpc_bdev_nvme_opal_init(&req);
|
||||
}
|
||||
SPDK_RPC_REGISTER("bdev_nvme_opal_init", spdk_rpc_bdev_nvme_opal_init, SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER("bdev_nvme_opal_init", rpc_bdev_nvme_opal_init, SPDK_RPC_RUNTIME)
|
||||
|
||||
struct rpc_bdev_nvme_opal_revert {
|
||||
char *nvme_ctrlr_name;
|
||||
@ -135,8 +135,8 @@ static const struct spdk_json_object_decoder rpc_bdev_nvme_opal_revert_decoders[
|
||||
};
|
||||
|
||||
static void
|
||||
spdk_rpc_bdev_nvme_opal_revert(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
rpc_bdev_nvme_opal_revert(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
{
|
||||
struct rpc_bdev_nvme_opal_revert req = {};
|
||||
struct spdk_json_write_ctx *w;
|
||||
@ -176,7 +176,7 @@ spdk_rpc_bdev_nvme_opal_revert(struct spdk_jsonrpc_request *request,
|
||||
out:
|
||||
free_rpc_bdev_nvme_opal_revert(&req);
|
||||
}
|
||||
SPDK_RPC_REGISTER("bdev_nvme_opal_revert", spdk_rpc_bdev_nvme_opal_revert, SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER("bdev_nvme_opal_revert", rpc_bdev_nvme_opal_revert, SPDK_RPC_RUNTIME)
|
||||
|
||||
struct rpc_bdev_opal_create {
|
||||
char *nvme_ctrlr_name;
|
||||
@ -204,8 +204,8 @@ static const struct spdk_json_object_decoder rpc_bdev_opal_create_decoders[] = {
|
||||
};
|
||||
|
||||
static void
|
||||
spdk_rpc_bdev_opal_create(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
rpc_bdev_opal_create(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
{
|
||||
struct rpc_bdev_opal_create req = {};
|
||||
struct spdk_json_write_ctx *w;
|
||||
@ -220,8 +220,8 @@ spdk_rpc_bdev_opal_create(struct spdk_jsonrpc_request *request,
|
||||
goto out;
|
||||
}
|
||||
|
||||
rc = spdk_vbdev_opal_create(req.nvme_ctrlr_name, req.nsid, req.locking_range_id, req.range_start,
|
||||
req.range_length, req.password);
|
||||
rc = vbdev_opal_create(req.nvme_ctrlr_name, req.nsid, req.locking_range_id, req.range_start,
|
||||
req.range_length, req.password);
|
||||
if (rc != 0) {
|
||||
spdk_jsonrpc_send_error_response_fmt(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
|
||||
"Failed to create opal vbdev from '%s': %s",
|
||||
@ -239,7 +239,7 @@ spdk_rpc_bdev_opal_create(struct spdk_jsonrpc_request *request,
|
||||
out:
|
||||
free_rpc_bdev_opal_create(&req);
|
||||
}
|
||||
SPDK_RPC_REGISTER("bdev_opal_create", spdk_rpc_bdev_opal_create, SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER("bdev_opal_create", rpc_bdev_opal_create, SPDK_RPC_RUNTIME)
|
||||
|
||||
struct rpc_bdev_opal_get_info {
|
||||
char *bdev_name;
|
||||
@ -259,8 +259,8 @@ static const struct spdk_json_object_decoder rpc_bdev_opal_get_info_decoders[] =
|
||||
};
|
||||
|
||||
static void
|
||||
spdk_rpc_bdev_opal_get_info(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
rpc_bdev_opal_get_info(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
{
|
||||
struct rpc_bdev_opal_get_info req = {};
|
||||
struct spdk_json_write_ctx *w;
|
||||
@ -274,7 +274,7 @@ spdk_rpc_bdev_opal_get_info(struct spdk_jsonrpc_request *request,
|
||||
goto out;
|
||||
}
|
||||
|
||||
info = spdk_vbdev_opal_get_info_from_bdev(req.bdev_name, req.password);
|
||||
info = vbdev_opal_get_info_from_bdev(req.bdev_name, req.password);
|
||||
if (info == NULL) {
|
||||
SPDK_ERRLOG("Get opal info failure\n");
|
||||
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, "Internal error");
|
||||
@ -298,7 +298,7 @@ spdk_rpc_bdev_opal_get_info(struct spdk_jsonrpc_request *request,
|
||||
out:
|
||||
free_rpc_bdev_opal_get_info(&req);
|
||||
}
|
||||
SPDK_RPC_REGISTER("bdev_opal_get_info", spdk_rpc_bdev_opal_get_info, SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER("bdev_opal_get_info", rpc_bdev_opal_get_info, SPDK_RPC_RUNTIME)
|
||||
|
||||
struct rpc_bdev_opal_delete {
|
||||
char *bdev_name;
|
||||
@ -318,8 +318,8 @@ static const struct spdk_json_object_decoder rpc_bdev_opal_delete_decoders[] = {
|
||||
};
|
||||
|
||||
static void
|
||||
spdk_rpc_bdev_opal_delete(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
rpc_bdev_opal_delete(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
{
|
||||
struct rpc_bdev_opal_delete req = {};
|
||||
struct spdk_json_write_ctx *w;
|
||||
@ -333,7 +333,7 @@ spdk_rpc_bdev_opal_delete(struct spdk_jsonrpc_request *request,
|
||||
goto out;
|
||||
}
|
||||
|
||||
rc = spdk_vbdev_opal_destruct(req.bdev_name, req.password);
|
||||
rc = vbdev_opal_destruct(req.bdev_name, req.password);
|
||||
if (rc < 0) {
|
||||
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, spdk_strerror(-rc));
|
||||
goto out;
|
||||
@ -345,7 +345,7 @@ spdk_rpc_bdev_opal_delete(struct spdk_jsonrpc_request *request,
|
||||
out:
|
||||
free_rpc_bdev_opal_delete(&req);
|
||||
}
|
||||
SPDK_RPC_REGISTER("bdev_opal_delete", spdk_rpc_bdev_opal_delete, SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER("bdev_opal_delete", rpc_bdev_opal_delete, SPDK_RPC_RUNTIME)
|
||||
|
||||
struct rpc_bdev_opal_set_lock_state {
|
||||
char *bdev_name;
|
||||
@ -370,8 +370,8 @@ static const struct spdk_json_object_decoder rpc_bdev_opal_set_lock_state_decode
|
||||
};
|
||||
|
||||
static void
|
||||
spdk_rpc_bdev_opal_set_lock_state(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
rpc_bdev_opal_set_lock_state(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
{
|
||||
struct rpc_bdev_opal_set_lock_state req = {};
|
||||
struct spdk_json_write_ctx *w;
|
||||
@ -385,7 +385,7 @@ spdk_rpc_bdev_opal_set_lock_state(struct spdk_jsonrpc_request *request,
|
||||
goto out;
|
||||
}
|
||||
|
||||
rc = spdk_vbdev_opal_set_lock_state(req.bdev_name, req.user_id, req.password, req.lock_state);
|
||||
rc = vbdev_opal_set_lock_state(req.bdev_name, req.user_id, req.password, req.lock_state);
|
||||
if (rc != 0) {
|
||||
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, spdk_strerror(-rc));
|
||||
goto out;
|
||||
@ -398,7 +398,7 @@ spdk_rpc_bdev_opal_set_lock_state(struct spdk_jsonrpc_request *request,
|
||||
out:
|
||||
free_rpc_bdev_opal_set_lock_state(&req);
|
||||
}
|
||||
SPDK_RPC_REGISTER("bdev_opal_set_lock_state", spdk_rpc_bdev_opal_set_lock_state, SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER("bdev_opal_set_lock_state", rpc_bdev_opal_set_lock_state, SPDK_RPC_RUNTIME)
|
||||
|
||||
struct rpc_bdev_opal_new_user {
|
||||
char *bdev_name;
|
||||
@ -423,8 +423,8 @@ static const struct spdk_json_object_decoder rpc_bdev_opal_new_user_decoders[] =
|
||||
};
|
||||
|
||||
static void
|
||||
spdk_rpc_bdev_opal_new_user(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
rpc_bdev_opal_new_user(struct spdk_jsonrpc_request *request,
|
||||
const struct spdk_json_val *params)
|
||||
{
|
||||
struct rpc_bdev_opal_new_user req = {};
|
||||
struct spdk_json_write_ctx *w;
|
||||
@ -438,8 +438,8 @@ spdk_rpc_bdev_opal_new_user(struct spdk_jsonrpc_request *request,
|
||||
goto out;
|
||||
}
|
||||
|
||||
rc = spdk_vbdev_opal_enable_new_user(req.bdev_name, req.admin_password, req.user_id,
|
||||
req.user_password);
|
||||
rc = vbdev_opal_enable_new_user(req.bdev_name, req.admin_password, req.user_id,
|
||||
req.user_password);
|
||||
if (rc != 0) {
|
||||
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, spdk_strerror(-rc));
|
||||
goto out;
|
||||
@ -452,4 +452,4 @@ spdk_rpc_bdev_opal_new_user(struct spdk_jsonrpc_request *request,
|
||||
out:
|
||||
free_rpc_bdev_opal_new_user(&req);
|
||||
}
|
||||
SPDK_RPC_REGISTER("bdev_opal_new_user", spdk_rpc_bdev_opal_new_user, SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER("bdev_opal_new_user", rpc_bdev_opal_new_user, SPDK_RPC_RUNTIME)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user