shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

config: fix check_options array

Browse Source 
The code used it as both a single string, and as
an array of strings in different places.  Fix it
so that it's an array of strings everywhere.
This commit is contained in:
David Teigland 2015-04-23 10:35:34 -05:00
parent a8bdfbe959
commit 95da21cc18
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/activate/dev_manager.c
View File

@ -1965,14 +1965,14 @@ static int _pool_register_callback(struct dev_manager *dm,
data->skip_zero = 1; data->skip_zero = 1;
data->exec = global_thin_check_executable_CFG; data->exec = global_thin_check_executable_CFG;
data->opts = global_thin_check_options_CFG; data->opts = global_thin_check_options_CFG;
data->defaults = DEFAULT_THIN_CHECK_OPTIONS; data->defaults = DEFAULT_THIN_CHECK_OPTION1 " " DEFAULT_THIN_CHECK_OPTION2;
data->global = "thin"; data->global = "thin";
} else if (lv_is_cache(lv)) { /* cache pool */ } else if (lv_is_cache(lv)) { /* cache pool */
data->pool_lv = first_seg(lv)->pool_lv; data->pool_lv = first_seg(lv)->pool_lv;
data->skip_zero = dm->activation; data->skip_zero = dm->activation;
data->exec = global_cache_check_executable_CFG; data->exec = global_cache_check_executable_CFG;
data->opts = global_cache_check_options_CFG; data->opts = global_cache_check_options_CFG;
data->defaults = DEFAULT_CACHE_CHECK_OPTIONS; data->defaults = DEFAULT_CACHE_CHECK_OPTION1;
data->global = "cache"; data->global = "cache";
} else { } else {
log_error(INTERNAL_ERROR "Registering unsupported pool callback."); log_error(INTERNAL_ERROR "Registering unsupported pool callback.");

4
lib/config/config_settings.h
View File

@ -812,7 +812,7 @@ cfg(global_thin_repair_executable_CFG, "thin_repair_executable", global_CFG_SECT
"Also see thin_repair_options.\n" "Also see thin_repair_options.\n"
"(For thin tools, see thin_check_executable.)\n") "(For thin tools, see thin_check_executable.)\n")
cfg_array(global_thin_check_options_CFG, "thin_check_options", global_CFG_SECTION, 0, CFG_TYPE_STRING, "#S" DEFAULT_THIN_CHECK_OPTIONS, vsn(2, 2, 96), NULL, cfg_array(global_thin_check_options_CFG, "thin_check_options", global_CFG_SECTION, 0, CFG_TYPE_STRING, "#S" DEFAULT_THIN_CHECK_OPTION1 "#S" DEFAULT_THIN_CHECK_OPTION2, vsn(2, 2, 96), NULL,
"String of options passed to the thin_check command.\n" "String of options passed to the thin_check command.\n"
"With thin_check version 2.1 or newer you can add\n" "With thin_check version 2.1 or newer you can add\n"
"--ignore-non-fatal-errors to let it pass through\n" "--ignore-non-fatal-errors to let it pass through\n"
@ -857,7 +857,7 @@ cfg(global_cache_repair_executable_CFG, "cache_repair_executable", global_CFG_SE
"Also see cache_repair_options.\n" "Also see cache_repair_options.\n"
"(For cache tools, see cache_check_executable.)\n") "(For cache tools, see cache_check_executable.)\n")
cfg_array(global_cache_check_options_CFG, "cache_check_options", global_CFG_SECTION, 0, CFG_TYPE_STRING, "#S" DEFAULT_CACHE_CHECK_OPTIONS, vsn(2, 2, 108), NULL, cfg_array(global_cache_check_options_CFG, "cache_check_options", global_CFG_SECTION, 0, CFG_TYPE_STRING, "#S" DEFAULT_CACHE_CHECK_OPTION1, vsn(2, 2, 108), NULL,
"String of options passed to the cache_check command.\n") "String of options passed to the cache_check command.\n")
cfg_array(global_cache_repair_options_CFG, "cache_repair_options", global_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, "#S" DEFAULT_CACHE_REPAIR_OPTIONS, vsn(2, 2, 108), NULL, cfg_array(global_cache_repair_options_CFG, "cache_repair_options", global_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, "#S" DEFAULT_CACHE_REPAIR_OPTIONS, vsn(2, 2, 108), NULL,

8
lib/config/defaults.h
View File

@ -76,9 +76,11 @@
#endif #endif
#ifdef THIN_CHECK_NEEDS_CHECK #ifdef THIN_CHECK_NEEDS_CHECK
# define DEFAULT_THIN_CHECK_OPTIONS "-q --clear-needs-check-flag" # define DEFAULT_THIN_CHECK_OPTION1 "-q"
# define DEFAULT_THIN_CHECK_OPTION2 "--clear-needs-check-flag"
#else #else
# define DEFAULT_THIN_CHECK_OPTIONS "-q" # define DEFAULT_THIN_CHECK_OPTION1 "-q"
# define DEFAULT_THIN_CHECK_OPTION2 ""
#endif #endif
#define DEFAULT_THIN_REPAIR_OPTIONS "" #define DEFAULT_THIN_REPAIR_OPTIONS ""
@ -93,7 +95,7 @@
#define DEFAULT_THIN_POOL_ZERO 1 #define DEFAULT_THIN_POOL_ZERO 1
#define DEFAULT_POOL_METADATA_SPARE 1 /* thin + cache */ #define DEFAULT_POOL_METADATA_SPARE 1 /* thin + cache */
#define DEFAULT_CACHE_CHECK_OPTIONS "-q" #define DEFAULT_CACHE_CHECK_OPTION1 "-q"
#define DEFAULT_CACHE_REPAIR_OPTIONS "" #define DEFAULT_CACHE_REPAIR_OPTIONS ""
#define DEFAULT_CACHE_POOL_METADATA_REQUIRE_SEPARATE_PVS 0 #define DEFAULT_CACHE_POOL_METADATA_REQUIRE_SEPARATE_PVS 0
#define DEFAULT_CACHE_POOL_CHUNK_SIZE 64 /* KB */ #define DEFAULT_CACHE_POOL_CHUNK_SIZE 64 /* KB */