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

Fix strncmps.

Browse Source
This commit is contained in:
Alasdair Kergon 2005-10-26 18:17:36 +00:00
parent 633f889c34
commit 1a44c009b0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libdm/ioctl/libdm-iface.c
View File

@ -1361,15 +1361,15 @@ static struct dm_ioctl *_do_dm_ioctl(struct dm_task *dmt, unsigned command,
if (dmt->no_open_count) if (dmt->no_open_count)
dmi->flags |= DM_SKIP_BDGET_FLAG; dmi->flags |= DM_SKIP_BDGET_FLAG;
log_debug("dm %s %s %s%s%s %s%0.0d%s%0.0d" log_debug("dm %s %s %s%s%s %s%0" PRIu32 "%s%0" PRIu32
"%s%c %.0llu %s [%u]", "%s%c %.0llu %s [%u]",
_cmd_data_v4[dmt->type].name, _cmd_data_v4[dmt->type].name,
dmi->name, dmi->uuid, dmt->newname ? " " : "", dmi->name, dmi->uuid, dmt->newname ? " " : "",
dmt->newname ? dmt->newname : "", dmt->newname ? dmt->newname : "",
dmt->major > 0 ? "(" : "", dmt->major > 0 ? "(" : "",
dmt->major > 0 ? dmt->major : 0, dmt->major,
dmt->major > 0 ? ":" : "", dmt->major > 0 ? ":" : "",
dmt->minor > 0 ? dmt->minor : 0, dmt->minor,
dmt->major > 0 ? ") " : "", dmt->major > 0 ? ") " : "",
dmt->no_open_count ? 'N' : 'O', dmt->no_open_count ? 'N' : 'O',
dmt->sector, dmt->message ? dmt->message : "", dmt->sector, dmt->message ? dmt->message : "",
@ -1377,8 +1377,7 @@ static struct dm_ioctl *_do_dm_ioctl(struct dm_task *dmt, unsigned command,
#ifdef DM_IOCTLS #ifdef DM_IOCTLS
if (ioctl(_control_fd, command, dmi) < 0) { if (ioctl(_control_fd, command, dmi) < 0) {
if (errno == ENXIO && ((dmt->type == DM_DEVICE_INFO) || 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 */ dmi->flags &= ~DM_EXISTS_FLAG; /* FIXME */
else { else {
if (_log_suppress) if (_log_suppress)
@ -1408,6 +1407,8 @@ int dm_task_run(struct dm_task *dmt)
return _dm_task_run_v1(dmt); return _dm_task_run_v1(dmt);
#endif #endif
dm_task_skip_lockfs(dmt); // AGK TEMP
if ((unsigned) dmt->type >= if ((unsigned) dmt->type >=
(sizeof(_cmd_data_v4) / sizeof(*_cmd_data_v4))) { (sizeof(_cmd_data_v4) / sizeof(*_cmd_data_v4))) {
log_error("Internal error: unknown device-mapper task %d", log_error("Internal error: unknown device-mapper task %d",