diff --git a/CHANGELOG.md b/CHANGELOG.md index f3c9d59a5..0e9b681c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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` diff --git a/include/spdk/bdev.h b/include/spdk/bdev.h index 5fcbe71cc..749404d22 100644 --- a/include/spdk/bdev.h +++ b/include/spdk/bdev.h @@ -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. * diff --git a/include/spdk/bdev_module.h b/include/spdk/bdev_module.h index 899470283..0e567d655 100644 --- a/include/spdk/bdev_module.h +++ b/include/spdk/bdev_module.h @@ -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); diff --git a/lib/bdev/Makefile b/lib/bdev/Makefile index 497e4bb27..d3f7ef487 100644 --- a/lib/bdev/Makefile +++ b/lib/bdev/Makefile @@ -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 diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c index af50e5d7b..cdcb44a4a 100644 --- a/lib/bdev/bdev.c +++ b/lib/bdev/bdev.c @@ -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) { diff --git a/lib/bdev/spdk_bdev.map b/lib/bdev/spdk_bdev.map index 36a592a36..438c92b5f 100644 --- a/lib/bdev/spdk_bdev.map +++ b/lib/bdev/spdk_bdev.map @@ -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; diff --git a/module/bdev/compress/vbdev_compress.c b/module/bdev/compress/vbdev_compress.c index 59e7f5c52..6c121522e 100644 --- a/module/bdev/compress/vbdev_compress.c +++ b/module/bdev/compress/vbdev_compress.c @@ -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, diff --git a/module/bdev/delay/vbdev_delay.c b/module/bdev/delay/vbdev_delay.c index fafa0702c..bbab2a403 100644 --- a/module/bdev/delay/vbdev_delay.c +++ b/module/bdev/delay/vbdev_delay.c @@ -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, diff --git a/module/bdev/zone_block/vbdev_zone_block.c b/module/bdev/zone_block/vbdev_zone_block.c index 90060c4e2..2838f38ed 100644 --- a/module/bdev/zone_block/vbdev_zone_block.c +++ b/module/bdev/zone_block/vbdev_zone_block.c @@ -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, diff --git a/module/event/subsystems/bdev/bdev.c b/module/event/subsystems/bdev/bdev.c index 5776cf273..9b4917c7e 100644 --- a/module/event/subsystems/bdev/bdev.c +++ b/module/event/subsystems/bdev/bdev.c @@ -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, };