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

cleanup: simplify _deps code

Browse Source 
Make _deps to always return name & uuid,
and postpone duplication of name and uuid into _create_dm_tree_node().
Saves some duplicated code.
This commit is contained in:
Zdenek Kabelac 2017-11-30 12:53:34 +01:00
parent 4dc8184803
commit 0e177cc7c9
1 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libdm/libdm-deptree.c
View File

@ -523,15 +523,14 @@ static struct dm_tree_node *_create_dm_tree_node(struct dm_tree *dtree,
struct dm_tree_node *node; struct dm_tree_node *node;
dev_t dev; dev_t dev;
if (!(node = dm_pool_zalloc(dtree->mem, sizeof(*node)))) { if (!(node = dm_pool_zalloc(dtree->mem, sizeof(*node))) ||
log_error("_create_dm_tree_node alloc failed"); !(node->name = dm_pool_strdup(dtree->mem, name)) ||
!(node->uuid = dm_pool_strdup(dtree->mem, uuid))) {
log_error("_create_dm_tree_node alloc failed.");
return NULL; return NULL;
} }
node->dtree = dtree; node->dtree = dtree;
node->name = name;
node->uuid = uuid;
node->info = *info; node->info = *info;
node->context = context; node->context = context;
node->udev_flags = udev_flags; node->udev_flags = udev_flags;
@ -882,10 +881,8 @@ static int _deps(struct dm_task **dmt, struct dm_pool *mem, uint32_t major, uint
} }
if (!info->exists) { if (!info->exists) {
if (name) *name = "";
*name = ""; *uuid = "";
if (uuid)
*uuid = "";
*deps = NULL; *deps = NULL;
} else { } else {
if (info->major != major) { if (info->major != major) {
@ -898,14 +895,8 @@ static int _deps(struct dm_task **dmt, struct dm_pool *mem, uint32_t major, uint
minor, info->minor); minor, info->minor);
goto failed; goto failed;
} }
if (name && !(*name = dm_pool_strdup(mem, dm_task_get_name(*dmt)))) { *name = dm_task_get_name(*dmt);
log_error("name pool_strdup failed"); *uuid = dm_task_get_uuid(*dmt);
goto failed;
}
if (uuid && !(*uuid = dm_pool_strdup(mem, dm_task_get_uuid(*dmt)))) {
log_error("uuid pool_strdup failed");
goto failed;
}
*deps = dm_task_get_deps(*dmt); *deps = dm_task_get_deps(*dmt);
} }
@ -1081,7 +1072,7 @@ static int _node_clear_table(struct dm_tree_node *dnode, uint16_t udev_flags)
struct dm_task *dmt = NULL, *deps_dmt = NULL; struct dm_task *dmt = NULL, *deps_dmt = NULL;
struct dm_info *info, deps_info; struct dm_info *info, deps_info;
struct dm_deps *deps = NULL; struct dm_deps *deps = NULL;
const char *name, *uuid; const char *name, *uuid, *depname, *depuuid;
const char *default_uuid_prefix; const char *default_uuid_prefix;
size_t default_uuid_prefix_len; size_t default_uuid_prefix_len;
uint32_t i; uint32_t i;
@ -1102,7 +1093,7 @@ static int _node_clear_table(struct dm_tree_node *dnode, uint16_t udev_flags)
return 1; return 1;
/* Get devices used by inactive table that's about to be deleted. */ /* Get devices used by inactive table that's about to be deleted. */
if (!_deps(&deps_dmt, dnode->dtree->mem, info->major, info->minor, NULL, NULL, 1, info, &deps)) { if (!_deps(&deps_dmt, dnode->dtree->mem, info->major, info->minor, &depname, &depuuid, 1, info, &deps)) {
log_error("Failed to obtain dependencies for %s before clearing table.", name); log_error("Failed to obtain dependencies for %s before clearing table.", name);
return 0; return 0;
} }
@ -1185,8 +1176,6 @@ struct dm_tree_node *dm_tree_add_new_dev_with_udev_flags(struct dm_tree *dtree,
{ {
struct dm_tree_node *dnode; struct dm_tree_node *dnode;
struct dm_info info = { 0 }; struct dm_info info = { 0 };
const char *name2;
const char *uuid2;
if (!name || !uuid) { if (!name || !uuid) {
log_error("Cannot add device without name and uuid."); log_error("Cannot add device without name and uuid.");
@ -1195,16 +1184,7 @@ struct dm_tree_node *dm_tree_add_new_dev_with_udev_flags(struct dm_tree *dtree,
/* Do we need to add node to tree? */ /* Do we need to add node to tree? */
if (!(dnode = dm_tree_find_node_by_uuid(dtree, uuid))) { if (!(dnode = dm_tree_find_node_by_uuid(dtree, uuid))) {
if (!(name2 = dm_pool_strdup(dtree->mem, name))) { if (!(dnode = _create_dm_tree_node(dtree, name, uuid, &info,
log_error("name pool_strdup failed");
return NULL;
}
if (!(uuid2 = dm_pool_strdup(dtree->mem, uuid))) {
log_error("uuid pool_strdup failed");
return NULL;
}
if (!(dnode = _create_dm_tree_node(dtree, name2, uuid2, &info,
context, 0))) context, 0)))
return_NULL; return_NULL;