mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
Use pool for dm_tree allocation
Using the same pool allocation strategy as we use for vg, so dm_tree structure is part of the pool itself.
This commit is contained in:
parent
7f815706ca
commit
0395dd2250
@ -1,5 +1,6 @@
|
|||||||
Version 1.02.68 -
|
Version 1.02.68 -
|
||||||
==================================
|
==================================
|
||||||
|
Allocate dm_tree structure from dm_tree pool.
|
||||||
Update debug logging for _resume_node.
|
Update debug logging for _resume_node.
|
||||||
Add functions to support thin provisioning target (API unstable).
|
Add functions to support thin provisioning target (API unstable).
|
||||||
Improve libdm-config error path reporting.
|
Improve libdm-config error path reporting.
|
||||||
|
@ -248,10 +248,14 @@ struct dm_tree {
|
|||||||
|
|
||||||
struct dm_tree *dm_tree_create(void)
|
struct dm_tree *dm_tree_create(void)
|
||||||
{
|
{
|
||||||
|
struct dm_pool *dmem;
|
||||||
struct dm_tree *dtree;
|
struct dm_tree *dtree;
|
||||||
|
|
||||||
if (!(dtree = dm_zalloc(sizeof(*dtree)))) {
|
if (!(dmem = dm_pool_create("dtree", 1024)) ||
|
||||||
log_error("dm_tree_create malloc failed");
|
!(dtree = dm_pool_zalloc(dmem, sizeof(*dtree)))) {
|
||||||
|
log_error("Failed to allocate dtree.");
|
||||||
|
if (dmem)
|
||||||
|
dm_pool_destroy(dmem);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -260,17 +264,11 @@ struct dm_tree *dm_tree_create(void)
|
|||||||
dm_list_init(&dtree->root.used_by);
|
dm_list_init(&dtree->root.used_by);
|
||||||
dtree->skip_lockfs = 0;
|
dtree->skip_lockfs = 0;
|
||||||
dtree->no_flush = 0;
|
dtree->no_flush = 0;
|
||||||
|
dtree->mem = dmem;
|
||||||
if (!(dtree->mem = dm_pool_create("dtree", 1024))) {
|
|
||||||
log_error("dtree pool creation failed");
|
|
||||||
dm_free(dtree);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(dtree->devs = dm_hash_create(8))) {
|
if (!(dtree->devs = dm_hash_create(8))) {
|
||||||
log_error("dtree hash creation failed");
|
log_error("dtree hash creation failed");
|
||||||
dm_pool_destroy(dtree->mem);
|
dm_pool_destroy(dtree->mem);
|
||||||
dm_free(dtree);
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -278,7 +276,6 @@ struct dm_tree *dm_tree_create(void)
|
|||||||
log_error("dtree uuid hash creation failed");
|
log_error("dtree uuid hash creation failed");
|
||||||
dm_hash_destroy(dtree->devs);
|
dm_hash_destroy(dtree->devs);
|
||||||
dm_pool_destroy(dtree->mem);
|
dm_pool_destroy(dtree->mem);
|
||||||
dm_free(dtree);
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -293,7 +290,6 @@ void dm_tree_free(struct dm_tree *dtree)
|
|||||||
dm_hash_destroy(dtree->uuids);
|
dm_hash_destroy(dtree->uuids);
|
||||||
dm_hash_destroy(dtree->devs);
|
dm_hash_destroy(dtree->devs);
|
||||||
dm_pool_destroy(dtree->mem);
|
dm_pool_destroy(dtree->mem);
|
||||||
dm_free(dtree);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int _nodes_are_linked(const struct dm_tree_node *parent,
|
static int _nodes_are_linked(const struct dm_tree_node *parent,
|
||||||
|
Loading…
Reference in New Issue
Block a user