shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-24 14:50:17 +03:00
Code

do not skip /dev/{disk,char}/M:m removal when the device node is already gone

Browse Source
This commit is contained in:
Kay Sievers 2011-11-01 13:33:33 +01:00
parent 45197c02a5
commit dbfb570586
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
udev/udev-node.c
View File

@ -416,20 +416,19 @@ int udev_node_remove(struct udev_device *dev)
if (devnode == NULL)
goto out;
if (stat(devnode, &stats) != 0) {
if (stat(devnode, &stats) == 0) {
if (stats.st_rdev != udev_device_get_devnum(dev)) {
info(udev, "device node '%s' points to a different device, skip removal\n", devnode);
err = -1;
goto out;
}
if (stats.st_mode & 01000) {
info(udev, "device node '%s' has sticky bit set, skip removal\n", devnode);
goto out;
}
} else {
info(udev, "device node '%s' not found\n", devnode);
goto out;
}
if (stats.st_rdev != udev_device_get_devnum(dev)) {
info(udev, "device node '%s' points to a different device, skip removal\n", devnode);
err = -1;
goto out;
}
if (stats.st_mode & 01000) {
info(udev, "device node '%s' has sticky bit set, skip removal\n", devnode);
goto out;
}
dev_check = udev_device_new_from_syspath(udev, udev_device_get_syspath(dev));