Commit edc95ba1 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

bdev/nvme: Delete unnecessary function declarations from bdev_nvme.h 



A few functions can be made private in bdev_nvme.c. Hence delete
these function declarations from bdev_nvme.h.

Besides, bdev_nvme_remove_trid() is only a function declaration.
Hence delete it together in this patch.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I7bf9ae6da332c6426f6eb40926e7c4130d9acd8a
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9444


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

module/bdev/nvme/bdev_nvme.c

+6 −6
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ nvme_ctrlr_get_next_active_ns(struct nvme_ctrlr *nvme_ctrlr, struct nvme_ns *ns) 
	return NULL;

}



struct nvme_ctrlr *

static struct nvme_ctrlr *

nvme_ctrlr_get(const struct spdk_nvme_transport_id *trid)

{

	struct nvme_ctrlr	*nvme_ctrlr;
@@ -353,7 +353,7 @@ nvme_bdev_dump_trid_json(const struct spdk_nvme_transport_id *trid, struct spdk_ 
	}

}



void

static void

nvme_ctrlr_delete(struct nvme_ctrlr *nvme_ctrlr)

{

	struct nvme_ctrlr_trid *trid, *tmp_trid;
@@ -406,7 +406,7 @@ nvme_ctrlr_unregister_cb(void *io_device) 
	pthread_mutex_unlock(&g_bdev_nvme_mutex);

}



void

static void

nvme_ctrlr_unregister(void *ctx)

{

	struct nvme_ctrlr *nvme_ctrlr = ctx;
@@ -414,7 +414,7 @@ nvme_ctrlr_unregister(void *ctx) 
	spdk_io_device_unregister(nvme_ctrlr, nvme_ctrlr_unregister_cb);

}



void

static void

nvme_ctrlr_release(struct nvme_ctrlr *nvme_ctrlr)

{

	pthread_mutex_lock(&nvme_ctrlr->mutex);
@@ -433,7 +433,7 @@ nvme_ctrlr_release(struct nvme_ctrlr *nvme_ctrlr) 
	nvme_ctrlr_unregister(nvme_ctrlr);

}



int

static int

bdev_nvme_create_bdev_channel_cb(void *io_device, void *ctx_buf)

{

	struct nvme_bdev_channel *nbdev_ch = ctx_buf;
@@ -455,7 +455,7 @@ bdev_nvme_create_bdev_channel_cb(void *io_device, void *ctx_buf) 
	return 0;

}



void

static void

bdev_nvme_destroy_bdev_channel_cb(void *io_device, void *ctx_buf)

{

	struct nvme_bdev_channel *nbdev_ch = ctx_buf;

module/bdev/nvme/bdev_nvme.h

+0 −9
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ struct nvme_bdev_channel { 
	struct nvme_ctrlr_channel	*ctrlr_ch;

};



struct nvme_ctrlr *nvme_ctrlr_get(const struct spdk_nvme_transport_id *trid);

struct nvme_ctrlr *nvme_ctrlr_get_by_name(const char *name);



typedef void (*nvme_ctrlr_for_each_fn)(struct nvme_ctrlr *nvme_ctrlr, void *ctx);
@@ -171,13 +170,6 @@ void nvme_ctrlr_for_each(nvme_ctrlr_for_each_fn fn, void *ctx); 
void nvme_bdev_dump_trid_json(const struct spdk_nvme_transport_id *trid,

			      struct spdk_json_write_ctx *w);



void nvme_ctrlr_release(struct nvme_ctrlr *nvme_ctrlr);

void nvme_ctrlr_unregister(void *ctx);

void nvme_ctrlr_delete(struct nvme_ctrlr *nvme_ctrlr);



int bdev_nvme_create_bdev_channel_cb(void *io_device, void *ctx_buf);

void bdev_nvme_destroy_bdev_channel_cb(void *io_device, void *ctx_buf);



struct nvme_ns *nvme_ctrlr_get_ns(struct nvme_ctrlr *nvme_ctrlr, uint32_t nsid);

struct nvme_ns *nvme_ctrlr_get_first_active_ns(struct nvme_ctrlr *nvme_ctrlr);

struct nvme_ns *nvme_ctrlr_get_next_active_ns(struct nvme_ctrlr *nvme_ctrlr, struct nvme_ns *ns);
@@ -208,7 +200,6 @@ struct spdk_nvme_qpair *bdev_nvme_get_io_qpair(struct spdk_io_channel *ctrlr_io_ 
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 bdev_nvme_remove_trid(const char *name, struct spdk_nvme_transport_id *trid);



int bdev_nvme_create(struct spdk_nvme_transport_id *trid,

		     struct spdk_nvme_host_id *hostid,