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

lib: net, notify, nvme, rocksdb remove spdk_ prefix. 



remove only the spdk_ prefix from static functions in
the above libraries.

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


Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 0be5557c

doc/nvme.md

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ Where X is unique SPDK NVMe controller index and Y is namespace id. 


Requests from CUSE are handled by pthreads when controller and namespaces are created.

Those pass the I/O or admin commands via a ring to a thread that processes them using

spdk_nvme_io_msg_process().

nvme_io_msg_process().



Ioctls that request information attained when attaching NVMe controller receive an

immediate response, without passing them through the ring.

lib/net/net_rpc.c

+9 −9
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static const struct spdk_json_object_decoder rpc_ip_address_decoders[] = { 
};



static void

spdk_rpc_net_interface_add_ip_address(struct spdk_jsonrpc_request *request,

rpc_net_interface_add_ip_address(struct spdk_jsonrpc_request *request,

				 const struct spdk_json_val *params)

{

	struct rpc_ip_address req = {};
@@ -100,12 +100,12 @@ spdk_rpc_net_interface_add_ip_address(struct spdk_jsonrpc_request *request, 
invalid:

	free_rpc_ip_address(&req);

}

SPDK_RPC_REGISTER("net_interface_add_ip_address", spdk_rpc_net_interface_add_ip_address,

SPDK_RPC_REGISTER("net_interface_add_ip_address", rpc_net_interface_add_ip_address,

		  SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(net_interface_add_ip_address, add_ip_address)



static void

spdk_rpc_net_interface_delete_ip_address(struct spdk_jsonrpc_request *request,

rpc_net_interface_delete_ip_address(struct spdk_jsonrpc_request *request,

				    const struct spdk_json_val *params)

{

	struct rpc_ip_address req = {};
@@ -147,12 +147,12 @@ spdk_rpc_net_interface_delete_ip_address(struct spdk_jsonrpc_request *request, 
invalid:

	free_rpc_ip_address(&req);

}

SPDK_RPC_REGISTER("net_interface_delete_ip_address", spdk_rpc_net_interface_delete_ip_address,

SPDK_RPC_REGISTER("net_interface_delete_ip_address", rpc_net_interface_delete_ip_address,

		  SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(net_interface_delete_ip_address, delete_ip_address)



static void

spdk_rpc_net_get_interfaces(struct spdk_jsonrpc_request *request,

rpc_net_get_interfaces(struct spdk_jsonrpc_request *request,

		       const struct spdk_json_val *params)

{

	struct spdk_json_write_ctx *w;
@@ -192,7 +192,7 @@ spdk_rpc_net_get_interfaces(struct spdk_jsonrpc_request *request, 


	spdk_jsonrpc_end_result(request, w);

}

SPDK_RPC_REGISTER("net_get_interfaces", spdk_rpc_net_get_interfaces, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("net_get_interfaces", rpc_net_get_interfaces, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(net_get_interfaces, get_interfaces)



SPDK_LOG_REGISTER_COMPONENT("net", SPDK_LOG_NET)

lib/notify/notify_rpc.c

+6 −6
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ notify_get_types_cb(const struct spdk_notify_type *type, void *ctx) 
}



static void

spdk_rpc_notify_get_types(struct spdk_jsonrpc_request *request,

rpc_notify_get_types(struct spdk_jsonrpc_request *request,

		     const struct spdk_json_val *params)

{

	struct spdk_json_write_ctx *w;
@@ -66,7 +66,7 @@ spdk_rpc_notify_get_types(struct spdk_jsonrpc_request *request, 


	spdk_jsonrpc_end_result(request, w);

}

SPDK_RPC_REGISTER("notify_get_types", spdk_rpc_notify_get_types, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("notify_get_types", rpc_notify_get_types, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(notify_get_types, get_notification_types)



struct rpc_notify_get_notifications {
@@ -96,7 +96,7 @@ notify_get_notifications_cb(uint64_t id, const struct spdk_notify_event *ev, voi 
}



static void

spdk_rpc_notify_get_notifications(struct spdk_jsonrpc_request *request,

rpc_notify_get_notifications(struct spdk_jsonrpc_request *request,

			     const struct spdk_json_val *params)

{

	struct rpc_notify_get_notifications req = {0, UINT64_MAX};
@@ -120,7 +120,7 @@ spdk_rpc_notify_get_notifications(struct spdk_jsonrpc_request *request, 


	spdk_jsonrpc_end_result(request, req.w);

}

SPDK_RPC_REGISTER("notify_get_notifications", spdk_rpc_notify_get_notifications, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("notify_get_notifications", rpc_notify_get_notifications, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(notify_get_notifications, get_notifications)



SPDK_LOG_REGISTER_COMPONENT("notify_rpc", SPDK_NOTIFY_RPC)

lib/nvme/nvme.c

+20 −20
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ nvme_ctrlr_probe(const struct spdk_nvme_transport_id *trid, 
	spdk_nvme_ctrlr_get_default_ctrlr_opts(&opts, sizeof(opts));



	if (!probe_ctx->probe_cb || probe_ctx->probe_cb(probe_ctx->cb_ctx, trid, &opts)) {

		ctrlr = spdk_nvme_get_ctrlr_by_trid_unsafe(trid);

		ctrlr = nvme_get_ctrlr_by_trid_unsafe(trid);

		if (ctrlr) {

			/* This ctrlr already exists.

			* Increase the ref count before calling attach_cb() as the user may
@@ -554,12 +554,12 @@ nvme_init_controllers(struct spdk_nvme_probe_ctx *probe_ctx) 


/* This function must not be called while holding g_spdk_nvme_driver->lock */

static struct spdk_nvme_ctrlr *

spdk_nvme_get_ctrlr_by_trid(const struct spdk_nvme_transport_id *trid)

nvme_get_ctrlr_by_trid(const struct spdk_nvme_transport_id *trid)

{

	struct spdk_nvme_ctrlr *ctrlr;



	nvme_robust_mutex_lock(&g_spdk_nvme_driver->lock);

	ctrlr = spdk_nvme_get_ctrlr_by_trid_unsafe(trid);

	ctrlr = nvme_get_ctrlr_by_trid_unsafe(trid);

	nvme_robust_mutex_unlock(&g_spdk_nvme_driver->lock);



	return ctrlr;
@@ -567,7 +567,7 @@ spdk_nvme_get_ctrlr_by_trid(const struct spdk_nvme_transport_id *trid) 


/* This function must be called while holding g_spdk_nvme_driver->lock */

struct spdk_nvme_ctrlr *

spdk_nvme_get_ctrlr_by_trid_unsafe(const struct spdk_nvme_transport_id *trid)

nvme_get_ctrlr_by_trid_unsafe(const struct spdk_nvme_transport_id *trid)

{

	struct spdk_nvme_ctrlr *ctrlr;
@@ -590,7 +590,7 @@ spdk_nvme_get_ctrlr_by_trid_unsafe(const struct spdk_nvme_transport_id *trid) 


/* This function must only be called while holding g_spdk_nvme_driver->lock */

static int

spdk_nvme_probe_internal(struct spdk_nvme_probe_ctx *probe_ctx,

nvme_probe_internal(struct spdk_nvme_probe_ctx *probe_ctx,

		    bool direct_connect)

{

	int rc;
@@ -651,7 +651,7 @@ spdk_nvme_probe_internal(struct spdk_nvme_probe_ctx *probe_ctx, 
}



static void

spdk_nvme_probe_ctx_init(struct spdk_nvme_probe_ctx *probe_ctx,

nvme_probe_ctx_init(struct spdk_nvme_probe_ctx *probe_ctx,

		    const struct spdk_nvme_transport_id *trid,

		    void *cb_ctx,

		    spdk_nvme_probe_cb probe_cb,
@@ -695,7 +695,7 @@ spdk_nvme_probe(const struct spdk_nvme_transport_id *trid, void *cb_ctx, 
}



static bool

spdk_nvme_connect_probe_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid,

nvme_connect_probe_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid,

		      struct spdk_nvme_ctrlr_opts *opts)

{

	struct spdk_nvme_ctrlr_opts *requested_opts = cb_ctx;
@@ -735,7 +735,7 @@ spdk_nvme_connect(const struct spdk_nvme_transport_id *trid, 
		return NULL;

	}



	ctrlr = spdk_nvme_get_ctrlr_by_trid(trid);

	ctrlr = nvme_get_ctrlr_by_trid(trid);



	return ctrlr;

}
@@ -1213,8 +1213,8 @@ spdk_nvme_probe_async(const struct spdk_nvme_transport_id *trid, 
		return NULL;

	}



	spdk_nvme_probe_ctx_init(probe_ctx, trid, cb_ctx, probe_cb, attach_cb, remove_cb);

	rc = spdk_nvme_probe_internal(probe_ctx, false);

	nvme_probe_ctx_init(probe_ctx, trid, cb_ctx, probe_cb, attach_cb, remove_cb);

	rc = nvme_probe_internal(probe_ctx, false);

	if (rc != 0) {

		free(probe_ctx);

		return NULL;
@@ -1273,11 +1273,11 @@ spdk_nvme_connect_async(const struct spdk_nvme_transport_id *trid, 
	}



	if (opts) {

		probe_cb = spdk_nvme_connect_probe_cb;

		probe_cb = nvme_connect_probe_cb;

	}



	spdk_nvme_probe_ctx_init(probe_ctx, trid, (void *)opts, probe_cb, attach_cb, NULL);

	rc = spdk_nvme_probe_internal(probe_ctx, true);

	nvme_probe_ctx_init(probe_ctx, trid, (void *)opts, probe_cb, attach_cb, NULL);

	rc = nvme_probe_internal(probe_ctx, true);

	if (rc != 0) {

		free(probe_ctx);

		return NULL;

lib/nvme/nvme_ctrlr.c

+4 −4
Original line number Diff line number Diff line
@@ -2882,7 +2882,7 @@ spdk_nvme_ctrlr_process_admin_completions(struct spdk_nvme_ctrlr *ctrlr) 
		nvme_ctrlr_keep_alive(ctrlr);

	}



	rc = spdk_nvme_io_msg_process(ctrlr);

	rc = nvme_io_msg_process(ctrlr);

	if (rc < 0) {

		nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);

		return rc;
@@ -2945,7 +2945,7 @@ spdk_nvme_ctrlr_get_num_ns(struct spdk_nvme_ctrlr *ctrlr) 
}



static int32_t

spdk_nvme_ctrlr_active_ns_idx(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid)

nvme_ctrlr_active_ns_idx(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid)

{

	int32_t result = -1;
@@ -2978,7 +2978,7 @@ spdk_nvme_ctrlr_active_ns_idx(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid) 
bool

spdk_nvme_ctrlr_is_active_ns(struct spdk_nvme_ctrlr *ctrlr, uint32_t nsid)

{

	return spdk_nvme_ctrlr_active_ns_idx(ctrlr, nsid) != -1;

	return nvme_ctrlr_active_ns_idx(ctrlr, nsid) != -1;

}



uint32_t
@@ -2990,7 +2990,7 @@ spdk_nvme_ctrlr_get_first_active_ns(struct spdk_nvme_ctrlr *ctrlr) 
uint32_t

spdk_nvme_ctrlr_get_next_active_ns(struct spdk_nvme_ctrlr *ctrlr, uint32_t prev_nsid)

{

	int32_t nsid_idx = spdk_nvme_ctrlr_active_ns_idx(ctrlr, prev_nsid);

	int32_t nsid_idx = nvme_ctrlr_active_ns_idx(ctrlr, prev_nsid);

	if (ctrlr->active_ns_list && nsid_idx >= 0 && (uint32_t)nsid_idx < ctrlr->num_ns - 1) {

		return ctrlr->active_ns_list[nsid_idx + 1];

	}