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

bdev_module: remove config_text

Browse Source 
This patch removes function for bdev modules to
present options of the bdevs.

blob_bdev.h refers to the spdk_bdev_module, so would need
to be bumped too.
At this time spdk_bdev_module is left unchanged to prevent
that.

Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I3cacb087c998d928c5d8c2722b7f041d82bb43f1
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4748
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI
This commit is contained in:
Tomasz Zawadzki 2020-10-15 05:34:43 -04:00 committed by Jim Harris
parent bd3840a729
commit 28ebb8cc78
10 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -16,6 +16,8 @@ A new `spdk_bdev_part_base_construct_ext` function has been added and the
of bdev structure to avoid a race condition that can happen when the bdev is being
removed between a call to get its structure based on a name and actually openning it.
Removed `spdk_bdev_config_text` function for bdev modules to report legacy config.
### blobstore
A new `spdk_bdev_create_bs_dev_ext` function has been added and `spdk_bdev_create_bs_dev_from_desc`

7
include/spdk/bdev.h
View File

@ -242,13 +242,6 @@ void spdk_bdev_initialize(spdk_bdev_init_cb cb_fn, void *cb_arg);
*/
void spdk_bdev_finish(spdk_bdev_fini_cb cb_fn, void *cb_arg);
/**
* Get the configuration options for the registered block device modules.
*
* \param fp The pointer to a file that will be written to the configuration options.
*/
void spdk_bdev_config_text(FILE *fp);
/**
* Get the full configuration options for the registered block device modules and created bdevs.
*

1
include/spdk/bdev_module.h
View File

@ -88,6 +88,7 @@ struct spdk_bdev_module {
/**
* Function called to return a text string representing the
* module's configuration options for inclusion in a configuration file.
* (Deprecated and shall not be called by bdev layer)
*/
void (*config_text)(FILE *fp);

4
lib/bdev/Makefile
View File

@ -34,8 +34,8 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
SO_VER := 3
SO_MINOR := 1
SO_VER := 4
SO_MINOR := 0
ifeq ($(CONFIG_VTUNE),y)
CFLAGS += -I$(CONFIG_VTUNE_DIR)/include -I$(CONFIG_VTUNE_DIR)/sdk/src/ittnotify

12
lib/bdev/bdev.c
View File

@ -981,18 +981,6 @@ bdev_module_get_max_ctx_size(void)
return max_bdev_module_size;
}
void
spdk_bdev_config_text(FILE *fp)
{
struct spdk_bdev_module *bdev_module;
TAILQ_FOREACH(bdev_module, &g_bdev_mgr.bdev_modules, internal.tailq) {
if (bdev_module->config_text) {
bdev_module->config_text(fp);
}
}
}
static void
bdev_qos_config_json(struct spdk_bdev *bdev, struct spdk_json_write_ctx *w)
{

1
lib/bdev/spdk_bdev.map
View File

@ -7,7 +7,6 @@
spdk_bdev_examine;
spdk_bdev_initialize;
spdk_bdev_finish;
spdk_bdev_config_text;
spdk_bdev_subsystem_config_json;
spdk_bdev_get_by_name;
spdk_bdev_first;

1
module/bdev/compress/vbdev_compress.c
View File

@ -1561,7 +1561,6 @@ static const struct spdk_bdev_fn_table vbdev_compress_fn_table = {
static struct spdk_bdev_module compress_if = {
.name = "compress",
.module_init = vbdev_compress_init,
.config_text = NULL,
.get_ctx_size = vbdev_compress_get_ctx_size,
.examine_disk = vbdev_compress_examine,
.module_fini = vbdev_compress_finish,

1
module/bdev/delay/vbdev_delay.c
View File

@ -54,7 +54,6 @@ static int vbdev_delay_config_json(struct spdk_json_write_ctx *w);
static struct spdk_bdev_module delay_if = {
.name = "delay",
.module_init = vbdev_delay_init,
.config_text = NULL,
.get_ctx_size = vbdev_delay_get_ctx_size,
.examine_config = vbdev_delay_examine,
.module_fini = vbdev_delay_finish,

1
module/bdev/zone_block/vbdev_zone_block.c
View File

@ -51,7 +51,6 @@ static struct spdk_bdev_module bdev_zoned_if = {
.name = "bdev_zoned_block",
.module_init = zone_block_init,
.module_fini = zone_block_finish,
.config_text = NULL,
.config_json = zone_block_config_json,
.examine_config = zone_block_examine,
.get_ctx_size = zone_block_get_ctx_size,

1
module/event/subsystems/bdev/bdev.c
View File

@ -74,7 +74,6 @@ static struct spdk_subsystem g_spdk_subsystem_bdev = {
.name = "bdev",
.init = bdev_subsystem_initialize,
.fini = bdev_subsystem_finish,
.config = spdk_bdev_config_text,
.write_config_json = bdev_subsystem_config_json,
};