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

DM_EXISTS_FLAG replaced by ENXIO

Browse Source
This commit is contained in:
Alasdair Kergon 2003-04-24 16:08:18 +00:00
parent 41d02bc385
commit 356409734e
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libdm/ioctl/libdevmapper.c
View File

@ -63,6 +63,11 @@ static struct cmd_data _cmd_data_v3[] = {
#define ALIGNMENT_V1 sizeof(int) #define ALIGNMENT_V1 sizeof(int)
#define ALIGNMENT 8 #define ALIGNMENT 8
/* FIXME Rejig library to record & use errno instead */
#ifndef DM_EXISTS_FLAG
# define DM_EXISTS_FLAG 0x00000004
#endif
static void *_align(void *ptr, unsigned int a) static void *_align(void *ptr, unsigned int a)
{ {
register unsigned long agn = --a; register unsigned long agn = --a;
@ -740,9 +745,14 @@ int dm_task_run(struct dm_task *dmt)
if (dmt->type == DM_DEVICE_TABLE) if (dmt->type == DM_DEVICE_TABLE)
dmi->flags |= DM_STATUS_TABLE_FLAG; dmi->flags |= DM_STATUS_TABLE_FLAG;
dmi->flags |= DM_EXISTS_FLAG; /* FIXME */
log_debug("dm %s %s %s %s", _cmd_data_v3[dmt->type].name, dmi->name, log_debug("dm %s %s %s %s", _cmd_data_v3[dmt->type].name, dmi->name,
dmi->uuid, dmt->newname ? dmt->newname : ""); dmi->uuid, dmt->newname ? dmt->newname : "");
if (ioctl(fd, command, dmi) < 0) { if (ioctl(fd, command, dmi) < 0) {
if (errno == ENXIO && dmt->type == DM_DEVICE_INFO) {
dmi->flags &= ~DM_EXISTS_FLAG; /* FIXME */
goto ignore_error;
}
if (_log_suppress) if (_log_suppress)
log_verbose("device-mapper ioctl cmd %d failed: %s", log_verbose("device-mapper ioctl cmd %d failed: %s",
_IOC_NR(command), strerror(errno)); _IOC_NR(command), strerror(errno));
@ -752,6 +762,7 @@ int dm_task_run(struct dm_task *dmt)
goto bad; goto bad;
} }
ignore_error:
switch (dmt->type) { switch (dmt->type) {
case DM_DEVICE_CREATE: case DM_DEVICE_CREATE:
add_dev_node(dmt->dev_name, MAJOR(dmi->dev), MINOR(dmi->dev)); add_dev_node(dmt->dev_name, MAJOR(dmi->dev), MINOR(dmi->dev));