From 01b1aa999e9af224f6483f674110c204d2356fac Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Wed, 26 Oct 2005 18:32:57 +0000 Subject: [PATCH] Fix incorrect checkin --- lib/ioctl/libdm-iface.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/ioctl/libdm-iface.c b/lib/ioctl/libdm-iface.c index 1766ffd..9f488c4 100644 --- a/lib/ioctl/libdm-iface.c +++ b/lib/ioctl/libdm-iface.c @@ -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) -- 2.43.5