Commit b95421d4 authored by Seth Howell's avatar Seth Howell Committed by Tomasz Zawadzki
Browse files

module/bdev_nvme: remove spdk prefix from static/internal functions. 



Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Change-Id: Iad8b672463c80abe1f13efc486bed0f88bccef21
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2329


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent d4f4fd45

module/bdev/nvme/bdev_nvme.c

+18 −18
Original line number Diff line number Diff line
@@ -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,7 +1700,7 @@ bdev_nvme_async_poll(void *arg) 
}



int

spdk_bdev_nvme_create(struct spdk_nvme_transport_id *trid,

bdev_nvme_create(struct spdk_nvme_transport_id *trid,

		 struct spdk_nvme_host_id *hostid,

		 const char *base_name,

		 const char **names,
@@ -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;

module/bdev/nvme/bdev_nvme.h

+15 −15
Original line number Diff line number Diff line
@@ -62,12 +62,12 @@ 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,

int bdev_nvme_create(struct spdk_nvme_transport_id *trid,

		     struct spdk_nvme_host_id *hostid,

		     const char *base_name,

		     const char **names,
@@ -76,7 +76,7 @@ int spdk_bdev_nvme_create(struct spdk_nvme_transport_id *trid, 
		     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);

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 */

module/bdev/nvme/bdev_nvme_cuse_rpc.c

+6 −6
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static const struct spdk_json_object_decoder rpc_nvme_cuse_register_decoders[] = 
};



static void

spdk_rpc_nvme_cuse_register(struct spdk_jsonrpc_request *request,

rpc_nvme_cuse_register(struct spdk_jsonrpc_request *request,

		       const struct spdk_json_val *params)

{

	struct rpc_nvme_cuse_register req = {};
@@ -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,7 +112,7 @@ static const struct spdk_json_object_decoder rpc_nvme_cuse_unregister_decoders[] 
};



static void

spdk_rpc_nvme_cuse_unregister(struct spdk_jsonrpc_request *request,

rpc_nvme_cuse_unregister(struct spdk_jsonrpc_request *request,

			 const struct spdk_json_val *params)

{

	struct rpc_nvme_cuse_unregister req = {};
@@ -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)

module/bdev/nvme/bdev_nvme_rpc.c

+32 −32
Original line number Diff line number Diff line
@@ -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,

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,7 +141,7 @@ rpc_bdev_nvme_set_hotplug_done(void *ctx) 
}



static void

spdk_rpc_bdev_nvme_set_hotplug(struct spdk_jsonrpc_request *request,

rpc_bdev_nvme_set_hotplug(struct spdk_jsonrpc_request *request,

			  const struct spdk_json_val *params)

{

	struct rpc_bdev_nvme_hotplug req = {false, 0};
@@ -154,7 +154,7 @@ 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,

	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,7 +250,7 @@ exit: 
}



static void

spdk_rpc_bdev_nvme_attach_controller(struct spdk_jsonrpc_request *request,

rpc_bdev_nvme_attach_controller(struct spdk_jsonrpc_request *request,

				const struct spdk_json_val *params)

{

	struct rpc_bdev_nvme_attach_controller_ctx *ctx;
@@ -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,12 +347,12 @@ 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,

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,7 +394,7 @@ 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,

rpc_bdev_nvme_get_controllers(struct spdk_jsonrpc_request *request,

			      const struct spdk_json_val *params)

{

	struct rpc_bdev_nvme_get_controllers req = {};
@@ -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,7 +455,7 @@ 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,

rpc_bdev_nvme_detach_controller(struct spdk_jsonrpc_request *request,

				const struct spdk_json_val *params)

{

	struct rpc_bdev_nvme_detach_controller req = {NULL};
@@ -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,7 +654,7 @@ 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,

rpc_bdev_nvme_apply_firmware(struct spdk_jsonrpc_request *request,

			     const struct spdk_json_val *params)

{

	int					rc;
@@ -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)

module/bdev/nvme/nvme_rpc.c

+7 −7
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ 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,

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;
@@ -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,7 +441,7 @@ 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,

rpc_bdev_nvme_send_cmd(struct spdk_jsonrpc_request *request,

		       const struct spdk_json_val *params)

{

	struct rpc_bdev_nvme_send_cmd_ctx *ctx;
@@ -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)