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

cleanup: messsage cleanup

Browse Source
This commit is contained in:
Zdenek Kabelac 2017-12-04 14:37:01 +01:00
parent 76954884c7
commit 5abf6b7c21
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libdm/libdm-deptree.c
View File

@ -1287,7 +1287,7 @@ static int _resume_node(const char *name, uint32_t major, uint32_t minor,
struct dm_task *dmt; struct dm_task *dmt;
int r = 0; int r = 0;
log_verbose("Resuming %s (%" PRIu32 ":%" PRIu32 ")", name, major, minor); log_verbose("Resuming %s (" FMTu32 ":" FMTu32 ").", name, major, minor);
if (!(dmt = dm_task_create(DM_DEVICE_RESUME))) { if (!(dmt = dm_task_create(DM_DEVICE_RESUME))) {
log_debug_activation("Suspend dm_task creation failed for %s.", name); log_debug_activation("Suspend dm_task creation failed for %s.", name);
@ -1607,8 +1607,8 @@ static int _dm_tree_deactivate_children(struct dm_tree_node *dnode,
/* When retry is not allowed, error */ /* When retry is not allowed, error */
if (!child->dtree->retry_remove) { if (!child->dtree->retry_remove) {
log_error("Unable to deactivate open %s (%" PRIu32 log_error("Unable to deactivate open %s (" FMTu32 ":"
":%" PRIu32 ")", name, info.major, info.minor); FMTu32 ").", name, info.major, info.minor);
r = 0; r = 0;
continue; continue;
} }
@ -1628,9 +1628,8 @@ static int _dm_tree_deactivate_children(struct dm_tree_node *dnode,
uuid_prefix, uuid_prefix_len))) { uuid_prefix, uuid_prefix_len))) {
/* Only report error from (likely non-internal) dependency at top level */ /* Only report error from (likely non-internal) dependency at top level */
if (!level) { if (!level) {
log_error("Unable to deactivate open %s (%" PRIu32 log_error("Unable to deactivate open %s (" FMTu32 ":"
":%" PRIu32 ")", name, info.major, FMTu32 ").", name, info.major, info.minor);
info.minor);
r = 0; r = 0;
} }
continue; continue;
@ -1644,9 +1643,8 @@ static int _dm_tree_deactivate_children(struct dm_tree_node *dnode,
if (!_deactivate_node(name, info.major, info.minor, if (!_deactivate_node(name, info.major, info.minor,
&child->dtree->cookie, child->udev_flags, &child->dtree->cookie, child->udev_flags,
(level == 0) ? child->dtree->retry_remove : 0)) { (level == 0) ? child->dtree->retry_remove : 0)) {
log_error("Unable to deactivate %s (%" PRIu32 log_error("Unable to deactivate %s (" FMTu32 ":"
":%" PRIu32 ")", name, info.major, FMTu32 ").", name, info.major, info.minor);
info.minor);
r = 0; r = 0;
continue; continue;
} }
@ -1738,9 +1736,8 @@ int dm_tree_suspend_children(struct dm_tree_node *dnode,
if (!_suspend_node(name, info.major, info.minor, if (!_suspend_node(name, info.major, info.minor,
child->dtree->skip_lockfs, child->dtree->skip_lockfs,
child->dtree->no_flush, &newinfo)) { child->dtree->no_flush, &newinfo)) {
log_error("Unable to suspend %s (%" PRIu32 log_error("Unable to suspend %s (" FMTu32 ":"
":%" PRIu32 ")", name, info.major, FMTu32 ")", name, info.major, info.minor);
info.minor);
r = 0; r = 0;
continue; continue;
} }