config: move scan settings to devices section

2 files changed, 23 insertions, 23 deletions

diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
index 08b9b2c39..b84916453 100644
--- a/lib/config/config_settings.h
+++ b/lib/config/config_settings.h
@@ -457,6 +457,26 @@ cfg(devices_allow_changes_with_duplicate_pvs_CFG, "allow_changes_with_duplicate_
 	"Enabling this setting allows the VG to be used as usual even with\n"
 	"uncertain devices.\n")
 
+cfg(devices_scan_async_CFG, "scan_async", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, DEFAULT_SCAN_ASYNC, vsn(2, 2, 173), NULL, 0, NULL,
+	"Use async I/O to read headers and metadata from disks in parallel.\n")
+
+cfg(devices_scan_size_CFG, "scan_size", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, DEFAULT_SCAN_SIZE_KB, vsn(2, 2, 173), NULL, 0, NULL,
+	"Number of KiB to read from each disk when scanning disks.\n"
+	"The initial scan size is intended to cover all the headers\n"
+	"and metadata that LVM places at the start of each disk so\n"
+	"that a single read operation can retrieve them all.\n"
+	"Any headers or metadata that lie beyond this size require\n"
+	"an additional disk read.\n")
+
+cfg(devices_async_events_CFG, "async_events", devices_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, DEFAULT_ASYNC_EVENTS, vsn(2, 2, 173), NULL, 0, NULL,
+	"Max number of concurrent async reads when scanning disks.\n"
+	"Up to this many disks can be read concurrently when scanning\n"
+	"disks with async I/O. If there are more disks than this,\n"
+	"they will be scanned serially with synchronous reads.\n"
+	"Increasing this number to match a larger number of disks may\n"
+	"improve performance, but will increase memory requirements.\n"
+	"This setting is limitted by the system aio configuration.\n")
+
 cfg_array(allocation_cling_tag_list_CFG, "cling_tag_list", allocation_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(2, 2, 77), NULL, 0, NULL,
 	"Advise LVM which PVs to use when searching for new space.\n"
 	"When searching for free space to extend an LV, the 'cling' allocation\n"
@@ -1553,26 +1573,6 @@ cfg(metadata_pvmetadataignore_CFG, "pvmetadataignore", metadata_CFG_SECTION, CFG
 	"If metadata areas on a PV are ignored, LVM will not store metadata\n"
 	"in them.\n")
 
-cfg(metadata_scan_async_CFG, "scan_async", metadata_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, DEFAULT_SCAN_ASYNC, vsn(2, 2, 173), NULL, 0, NULL,
-	"Use async I/O to read headers and metadata from disks in parallel.\n")
-
-cfg(metadata_scan_size_CFG, "scan_size", metadata_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, DEFAULT_SCAN_SIZE_KB, vsn(2, 2, 173), NULL, 0, NULL,
-	"Number of KiB to read from each disk when scanning disks.\n"
-	"The initial scan size is intended to cover all the headers\n"
-	"and metadata that LVM places at the start of each disk so\n"
-	"that a single read operation can retrieve them all.\n"
-	"Any headers or metadata that lie beyond this size require\n"
-	"an additional disk read.\n")
-
-cfg(metadata_async_events_CFG, "async_events", metadata_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, DEFAULT_ASYNC_EVENTS, vsn(2, 2, 173), NULL, 0, NULL,
-	"Max number of concurrent async reads when scanning disks.\n"
-	"Up to this many disks can be read concurrently when scanning\n"
-	"disks with async I/O. If there are more disks than this,\n"
-	"they will be scanned serially with synchronous reads.\n"
-	"Increasing this number to match a larger number of disks may\n"
-	"improve performance, but will increase memory requirements.\n"
-	"This setting is limitted by the system aio configuration.\n")
-
 cfg(metadata_stripesize_CFG, "stripesize", metadata_CFG_SECTION, CFG_ADVANCED | CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, DEFAULT_STRIPESIZE, vsn(1, 0, 0), NULL, 0, NULL, NULL)
 
 cfg_array(metadata_dirs_CFG, "dirs", metadata_CFG_SECTION, CFG_ADVANCED | CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(1, 0, 0), NULL, 0, NULL,
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 9aa9e80bd..6d32ad288 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -2388,13 +2388,13 @@ static int _get_current_settings(struct cmd_context *cmd)
 		return EINVALID_CMD_LINE;
 
 #ifdef AIO_SUPPORT
-	cmd->use_aio = find_config_tree_bool(cmd, metadata_scan_async_CFG, NULL);
+	cmd->use_aio = find_config_tree_bool(cmd, devices_scan_async_CFG, NULL);
 #else
 	cmd->use_aio = 0;
-	if (find_config_tree_bool(cmd, metadata_scan_async_CFG, NULL))
+	if (find_config_tree_bool(cmd, devices_scan_async_CFG, NULL))
 		log_verbose("Ignoring scan_async, no async I/O support.");
 #endif
-	scan_size = find_config_tree_int(cmd, metadata_scan_size_CFG, NULL);
+	scan_size = find_config_tree_int(cmd, devices_scan_size_CFG, NULL);
 
 	if (!scan_size || (scan_size < 0)) {
 		log_warn("WARNING: Ignoring invalid metadata/scan_size %d, using default %u.",