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

cache/misc: Revert commit 94377dfd

Browse Source 
I am reverting the commit below - removing the new 'dm_config_get_int'
function and simply calling 'dm_config_get_uint32' while casting the
'int *' pointer parameter.

Commit being reverted:
commit 94377dfd5e
Author: Jonathan Brassow <jbrassow@redhat.com>
Date:   Mon Jan 27 05:26:19 2014 -0600

    Misc: New function for reading lvm config file fields

    Introduce 'dm_config_get_int', which will be used by the upcoming
    cachepool segment type.
This commit is contained in:
Jonathan Brassow 2014-01-28 11:26:05 -06:00
parent 42fa0e6dd1
commit d9bec60a23
3 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/cache_segtype/cache.c
View File

@ -97,7 +97,8 @@ static int _cache_pool_text_import(struct lv_segment *seg,
if (!dm_config_has_node(sn, "core_argv"))
return SEG_LOG_ERROR("not all core arguments defined in");
if (!dm_config_get_int(sn, "core_argc", &seg->core_argc))
if (!dm_config_get_uint32(sn, "core_argc",
(uint32_t *)&seg->core_argc))
return SEG_LOG_ERROR("Unable to read core_argc in");
str = dm_config_find_str(sn, "core_argv", NULL);
@ -135,7 +136,8 @@ static int _cache_pool_text_import(struct lv_segment *seg,
return SEG_LOG_ERROR("policy_name must be a string in");
seg->policy_name = dm_pool_strdup(mem, str);
if (!dm_config_get_int(sn, "policy_argc", &seg->policy_argc))
if (!dm_config_get_uint32(sn, "policy_argc",
(uint32_t *)&seg->policy_argc))
return SEG_LOG_ERROR("Unable to read policy_argc in");
str = dm_config_find_str(sn, "policy_argv", NULL);

1
libdm/libdevmapper.h
View File

@ -1720,7 +1720,6 @@ int dm_config_tree_find_bool(const struct dm_config_tree *cft, const char *path,
int dm_config_find_bool(const struct dm_config_node *cn, const char *path, int fail);
int dm_config_value_is_bool(const struct dm_config_value *v);
int dm_config_get_int(const struct dm_config_node *cn, const char *path, int *result);
int dm_config_get_uint32(const struct dm_config_node *cn, const char *path, uint32_t *result);
int dm_config_get_uint64(const struct dm_config_node *cn, const char *path, uint64_t *result);
int dm_config_get_str(const struct dm_config_node *cn, const char *path, const char **result);

14
libdm/libdm-config.c
View File

@ -1047,20 +1047,6 @@ int dm_config_tree_find_bool(const struct dm_config_tree *cft, const char *path,
/************************************/
int dm_config_get_int(const struct dm_config_node *cn, const char *path,
int *result)
{
const struct dm_config_node *n;
n = _find_config_node(cn, path);
if (!n || !n->v || n->v->type != DM_CFG_INT)
return 0;
if (result)
*result = n->v->v.i;
return 1;
}
int dm_config_get_uint32(const struct dm_config_node *cn, const char *path,
uint32_t *result)