config: move init of aio/scan settings

2 files changed, 24 insertions, 24 deletions

diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c
index e742df5e0..9f69179a7 100644
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -542,6 +542,7 @@ static int _process_config(struct cmd_context *cmd)
 	const struct dm_config_value *cv;
 	int64_t pv_min_kb;
 	int udev_disabled = 0;
+	int scan_size;
 	char sysfs_dir[PATH_MAX];
 
 	if (!_check_config(cmd))
@@ -625,6 +626,29 @@ static int _process_config(struct cmd_context *cmd)
 	cmd->default_settings.udev_sync = udev_disabled ? 0 :
 		find_config_tree_bool(cmd, activation_udev_sync_CFG, NULL);
 
+#ifdef AIO_SUPPORT
+	cmd->use_aio = find_config_tree_bool(cmd, devices_scan_async_CFG, NULL);
+#else
+	cmd->use_aio = 0;
+	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, devices_scan_size_CFG, NULL);
+
+	if (!scan_size || (scan_size < 0)) {
+		log_warn("WARNING: Ignoring invalid metadata/scan_size %d, using default %u.",
+			 scan_size, DEFAULT_SCAN_SIZE_KB);
+		scan_size = DEFAULT_SCAN_SIZE_KB;
+	}
+
+	if (cmd->use_aio && (scan_size % 4)) {
+		log_warn("WARNING: Ignoring invalid metadata/scan_size %d with scan_async, using default %u.",
+			 scan_size, DEFAULT_SCAN_SIZE_KB);
+		scan_size = DEFAULT_SCAN_SIZE_KB;
+	}
+
+	cmd->default_settings.scan_size_kb = scan_size;
+
 	/*
 	 * Set udev_fallback lazily on first use since it requires
 	 * checking DM driver version which is an extra ioctl!
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 8ae28855b..5c94e1f1c 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -2266,7 +2266,6 @@ static void _apply_current_output_settings(struct cmd_context *cmd)
 static int _get_current_settings(struct cmd_context *cmd)
 {
 	const char *activation_mode;
-	int scan_size;
 
 	_get_current_output_settings_from_args(cmd);
 
@@ -2388,29 +2387,6 @@ static int _get_current_settings(struct cmd_context *cmd)
 	     !_merge_synonym(cmd, metadatacopies_ARG, vgmetadatacopies_ARG)))
 		return EINVALID_CMD_LINE;
 
-#ifdef AIO_SUPPORT
-	cmd->use_aio = find_config_tree_bool(cmd, devices_scan_async_CFG, NULL);
-#else
-	cmd->use_aio = 0;
-	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, devices_scan_size_CFG, NULL);
-
-	if (!scan_size || (scan_size < 0)) {
-		log_warn("WARNING: Ignoring invalid metadata/scan_size %d, using default %u.",
-			 scan_size, DEFAULT_SCAN_SIZE_KB);
-		scan_size = DEFAULT_SCAN_SIZE_KB;
-	}
-
-	if (cmd->use_aio && (scan_size % 4)) {
-		log_warn("WARNING: Ignoring invalid metadata/scan_size %d with scan_async, using default %u.",
-			 scan_size, DEFAULT_SCAN_SIZE_KB);
-		scan_size = DEFAULT_SCAN_SIZE_KB;
-	}
-
-	cmd->current_settings.scan_size_kb = scan_size;
-
 	/* Zero indicates success */
 	return 0;
 }