]> sourceware.org Git - dm.git/commitdiff
Fix incorrect checkin
authorAlasdair Kergon <agk@redhat.com>
Wed, 26 Oct 2005 18:32:57 +0000 (18:32 +0000)
committerAlasdair Kergon <agk@redhat.com>
Wed, 26 Oct 2005 18:32:57 +0000 (18:32 +0000)
lib/ioctl/libdm-iface.c

index 1766ffd8cc9f6b5342bc243dec91f13ea34c94a8..9f488c465297c4d61e41d5ce037eda381110a645 100644 (file)
@@ -1361,15 +1361,15 @@ 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 %s%0" PRIu32 "%s%0" PRIu32
+       log_debug("dm %s %s %s%s%s %s%0.0d%s%0.0d"
                  "%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->major : 0,
                  dmt->major > 0 ? ":" : "",
-                 dmt->minor,
+                 dmt->minor > 0 ? dmt->minor : 0,
                  dmt->major > 0 ? ") " : "",
                  dmt->no_open_count ? 'N' : 'O',
                  dmt->sector, dmt->message ? dmt->message : "",
@@ -1377,7 +1377,8 @@ static struct dm_ioctl *_do_dm_ioctl(struct dm_task *dmt, unsigned command,
 #ifdef DM_IOCTLS
        if (ioctl(_control_fd, command, dmi) < 0) {
                if (errno == ENXIO && ((dmt->type == DM_DEVICE_INFO) ||
-                                      (dmt->type == DM_DEVICE_MKNODES)))
+                                      (dmt->type == DM_DEVICE_MKNODES) ||
+                                      (dmt->type == DM_DEVICE_STATUS)))
                        dmi->flags &= ~DM_EXISTS_FLAG;  /* FIXME */
                else {
                        if (_log_suppress)
This page took 0.028055 seconds and 5 git commands to generate.