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

libdm: unlink checks for ENOENT

Browse Source
This commit is contained in:
Zdenek Kabelac 2024-05-07 22:34:17 +02:00
parent a763420786
commit e56e7ed533
4 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
device_mapper/ioctl/libdm-iface.c
View File

@ -247,6 +247,16 @@ static int _control_device_number(uint32_t *major, uint32_t *minor)
return 1; return 1;
} }
static int _control_unlink(const char *control)
{
if (unlink(control) && (errno != ENOENT)) {
log_sys_error("unlink", control);
return -1;
}
return 0;
}
/* /*
* Returns 1 if it exists on returning; 0 if it doesn't; -1 if it's wrong. * Returns 1 if it exists on returning; 0 if it doesn't; -1 if it's wrong.
*/ */
@ -262,10 +272,7 @@ static int _control_exists(const char *control, uint32_t major, uint32_t minor)
if (!S_ISCHR(buf.st_mode)) { if (!S_ISCHR(buf.st_mode)) {
log_verbose("%s: Wrong inode type", control); log_verbose("%s: Wrong inode type", control);
if (!unlink(control)) return _control_unlink(control);
return 0;
log_sys_error("unlink", control);
return -1;
} }
if (major && buf.st_rdev != MKDEV(major, minor)) { if (major && buf.st_rdev != MKDEV(major, minor)) {
@ -273,10 +280,7 @@ static int _control_exists(const char *control, uint32_t major, uint32_t minor)
"(%u, %u)", control, "(%u, %u)", control,
MAJOR(buf.st_mode), MINOR(buf.st_mode), MAJOR(buf.st_mode), MINOR(buf.st_mode),
major, minor); major, minor);
if (!unlink(control)) return _control_unlink(control);
return 0;
log_sys_error("unlink", control);
return -1;
} }
return 1; return 1;

9
device_mapper/libdm-common.c
View File

@ -1060,9 +1060,8 @@ static int _add_dev_node(const char *dev_name, uint32_t major, uint32_t minor,
if (info.st_rdev == dev) if (info.st_rdev == dev)
return 1; return 1;
if (unlink(path) < 0) { if (unlink(path) && (errno != ENOENT)) {
log_error("Unable to unlink device node for '%s'", log_sys_error("unlink", path);
dev_name);
return 0; return 0;
} }
} else if (_warn_if_op_needed(warn_if_udev_failed)) } else if (_warn_if_op_needed(warn_if_udev_failed))
@ -1106,8 +1105,8 @@ static int _rm_dev_node(const char *dev_name, int warn_if_udev_failed)
"Falling back to direct node removal.", path); "Falling back to direct node removal.", path);
/* udev may already have deleted the node. Ignore ENOENT. */ /* udev may already have deleted the node. Ignore ENOENT. */
if (unlink(path) < 0 && errno != ENOENT) { if (unlink(path) && (errno != ENOENT)) {
log_error("Unable to unlink device node for '%s'", dev_name); log_sys_error("unlink", path);
return 0; return 0;
} }

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

@ -246,6 +246,16 @@ static int _control_device_number(uint32_t *major, uint32_t *minor)
return 1; return 1;
} }
static int _control_unlink(const char *control)
{
if (unlink(control) && (errno != ENOENT)) {
log_sys_error("unlink", control);
return -1;
}
return 0;
}
/* /*
* Returns 1 if it exists on returning; 0 if it doesn't; -1 if it's wrong. * Returns 1 if it exists on returning; 0 if it doesn't; -1 if it's wrong.
*/ */
@ -261,10 +271,7 @@ static int _control_exists(const char *control, uint32_t major, uint32_t minor)
if (!S_ISCHR(buf.st_mode)) { if (!S_ISCHR(buf.st_mode)) {
log_verbose("%s: Wrong inode type", control); log_verbose("%s: Wrong inode type", control);
if (!unlink(control)) return _control_unlink(control);
return 0;
log_sys_error("unlink", control);
return -1;
} }
if (major && buf.st_rdev != MKDEV(major, minor)) { if (major && buf.st_rdev != MKDEV(major, minor)) {
@ -272,10 +279,7 @@ static int _control_exists(const char *control, uint32_t major, uint32_t minor)
"(%u, %u)", control, "(%u, %u)", control,
MAJOR(buf.st_mode), MINOR(buf.st_mode), MAJOR(buf.st_mode), MINOR(buf.st_mode),
major, minor); major, minor);
if (!unlink(control)) return _control_unlink(control);
return 0;
log_sys_error("unlink", control);
return -1;
} }
return 1; return 1;

9
libdm/libdm-common.c
View File

@ -1058,9 +1058,8 @@ static int _add_dev_node(const char *dev_name, uint32_t major, uint32_t minor,
if (info.st_rdev == dev) if (info.st_rdev == dev)
return 1; return 1;
if (unlink(path) < 0) { if (unlink(path) && (errno != ENOENT)) {
log_error("Unable to unlink device node for '%s'", log_sys_error("unlink", path);
dev_name);
return 0; return 0;
} }
} else if (_warn_if_op_needed(warn_if_udev_failed)) } else if (_warn_if_op_needed(warn_if_udev_failed))
@ -1104,8 +1103,8 @@ static int _rm_dev_node(const char *dev_name, int warn_if_udev_failed)
"Falling back to direct node removal.", path); "Falling back to direct node removal.", path);
/* udev may already have deleted the node. Ignore ENOENT. */ /* udev may already have deleted the node. Ignore ENOENT. */
if (unlink(path) < 0 && errno != ENOENT) { if (unlink(path) && (errno != ENOENT)) {
log_error("Unable to unlink device node for '%s'", dev_name); log_sys_error("unlink", path);
return 0; return 0;
} }