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

thin: regression fix for metadata checking

Browse Source 
Fix regression from commit f173274fe4
and restore support for 'disabled' checking via lvm.conf.
This commit is contained in:
Zdenek Kabelac 2017-12-08 13:09:45 +01:00
parent 455b26b8db
commit 71485ebfc7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/activate/dev_manager.c
View File

@ -1913,7 +1913,12 @@ static int _pool_callback(struct dm_tree_node *node,
long buf[64 / sizeof(long)]; /* buffer for short disk header (64B) */
int args = 0;
char *mpath;
const char *argv[19] = { 0 }; /* Max supported 15 args */
const char *argv[19] = { /* Max supported 15 args */
find_config_tree_str_allow_empty(pool_lv->vg->cmd, data->exec, NULL)
};
if (!*argv[0]) /* *_check tool is unconfigured/disabled with "" setting */
return 1;
if (!(mpath = lv_dmpath_dup(data->dm->mem, mlv))) {
log_error("Failed to build device path for checking pool metadata %s.",
@ -1947,9 +1952,6 @@ static int _pool_callback(struct dm_tree_node *node,
}
}
if (!(argv[0] = find_config_tree_str_allow_empty(pool_lv->vg->cmd, data->exec, NULL)))
return 1; /* Checking disabled */
if (!(cn = find_config_tree_array(mlv->vg->cmd, data->opts, NULL))) {
log_error(INTERNAL_ERROR "Unable to find configuration for pool check options.");
return 0;