mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
config: require dm_config_create_value for dm_config_node's value
If we were defining a section (which is a node without a value) and the value was created automatically on dm_config_create_node call, we were wasting resources as the next step after creating the config node itself was assigning NULL for the node's value. The dm_config_node_create + dm_config_create_value sequence should be used instead for settings and dm_config_node_create alone for sections. The majority of the code already used the correct sequence. Though with dm_config_node_create fn creating the value as well, the pool memory was being trashed this way. This patch removes the node value initialization on dm_config_create_node fn call and keeps it for the direct dm_config_create_value fn call.
This commit is contained in:
parent
2a70e98b05
commit
847e2856a2
@ -1,5 +1,6 @@
|
||||
Version 1.02.77 -
|
||||
=================================
|
||||
Don't create value for dm_config_node and require dm_config_create_value call.
|
||||
Check for existing new_name for dmsetup rename.
|
||||
Fix memory leak in dmsetup _get_split_name() error path.
|
||||
|
||||
|
@ -520,12 +520,19 @@ static response vg_lookup(lvmetad_state *s, request r)
|
||||
if (!(res.cft->root = n = dm_config_create_node(res.cft, "response")))
|
||||
goto bad;
|
||||
|
||||
if (!(n->v = dm_config_create_value(cft)))
|
||||
goto bad;
|
||||
|
||||
n->parent = res.cft->root;
|
||||
n->v->type = DM_CFG_STRING;
|
||||
n->v->v.str = "OK";
|
||||
|
||||
if (!(n = n->sib = dm_config_create_node(res.cft, "name")))
|
||||
goto bad;
|
||||
|
||||
if (!(n->v = dm_config_create_value(res.cft)))
|
||||
goto bad;
|
||||
|
||||
n->parent = res.cft->root;
|
||||
n->v->type = DM_CFG_STRING;
|
||||
n->v->v.str = name;
|
||||
|
@ -1169,14 +1169,9 @@ struct dm_config_node *dm_config_create_node(struct dm_config_tree *cft, const c
|
||||
log_error("Failed to create config node's key.");
|
||||
return NULL;
|
||||
}
|
||||
if (!(cn->v = _create_value(cft->mem))) {
|
||||
log_error("Failed to create config node's value.");
|
||||
return NULL;
|
||||
}
|
||||
cn->parent = NULL;
|
||||
cn->v->type = DM_CFG_INT;
|
||||
cn->v->v.i = 0;
|
||||
cn->v->next = NULL;
|
||||
cn->v = NULL;
|
||||
|
||||
return cn;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user