Tidy some log mesgs.

diff --git a/lib/ioctl/libdm-iface.c b/lib/ioctl/libdm-iface.c
index 02354c88034ba30e46a99e6144960b8ac7e10495..806056502309aba8b95e3850136b9d40835e7f54 100644 (file)
--- a/lib/ioctl/libdm-iface.c
+++ b/lib/ioctl/libdm-iface.c
@@ -1361,10 +1361,16 @@ static struct dm_ioctl *_do_dm_ioctl(struct dm_task *dmt, unsigned command,
        if (dmt->no_open_count)
                dmi->flags |= DM_SKIP_BDGET_FLAG;
 
-       log_debug("dm %s %s %s%s%s %c %.0llu %s [%u]",
+       log_debug("dm %s %s %s%s%s %s%0" PRIu32 "%s%0" PRIu32
+                 "%s%c %.0llu %s [%u]",
                  _cmd_data_v4[dmt->type].name,
                  dmi->name, dmi->uuid, dmt->newname ? " " : "",
                  dmt->newname ? dmt->newname : "",
+                 dmt->major > 0 ? "(" : "",
+                 dmt->major,
+                 dmt->major > 0 ? ":" : "",
+                 dmt->minor,
+                 dmt->major > 0 ? ") " : "",
                  dmt->no_open_count ? 'N' : 'O',
                  dmt->sector, dmt->message ? dmt->message : "",
                  dmi->data_size);

diff --git a/lib/libdm-common.c b/lib/libdm-common.c
index ed4392c80a107f630032a5d2d6570adb7f0408ab..c288eafc7f5c1308ef050528956737622aeb7a1f 100644 (file)
--- a/lib/libdm-common.c
+++ b/lib/libdm-common.c
@@ -169,7 +169,6 @@ int dm_task_set_uuid(struct dm_task *dmt, const char *uuid)
 int dm_task_set_major(struct dm_task *dmt, int major)
 {
        dmt->major = major;
-       log_debug("Setting major: %d", dmt->major);
 
        return 1;
 }
@@ -177,7 +176,6 @@ int dm_task_set_major(struct dm_task *dmt, int major)
 int dm_task_set_minor(struct dm_task *dmt, int minor)
 {
        dmt->minor = minor;
-       log_debug("Setting minor: %d", dmt->minor);
 
        return 1;
 }

diff --git a/lib/libdm-deptree.c b/lib/libdm-deptree.c
index b83f5d58fd8fe7bd71d9481b58b497b91b85c09a..b2a2f78488113978e9cdb0715785ed56fe8000a2 100644 (file)
--- a/lib/libdm-deptree.c
+++ b/lib/libdm-deptree.c
@@ -480,10 +480,8 @@ int dm_deptree_deactivate_children(struct deptree_node *dnode, const char *uuid_
                }
 
                /* Ignore if it doesn't belong to this VG */
-               if (strncmp(uuid, uuid_prefix, uuid_prefix_len)) {
-                       stack;
+               if (strncmp(uuid, uuid_prefix, uuid_prefix_len))
                        continue;
-               }
 
                /* Refresh open_count */
                if (!_info_by_dev(dinfo->major, dinfo->minor, &info) ||