shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

udev: do not try to lock whole block device on remove event

Browse Source 
As another device may be created with the same device node while udevd
is processing the remove event of the previous owner of the device node.

This also adds comment why we skip watching device node on remove.

(cherry picked from commit e8df18c9e1)
This commit is contained in:
Yu Watanabe 2024-10-15 06:22:24 +09:00 committed by Luca Boccassi
parent 6a288cd999
commit 864a42f309
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/udev/udev-watch.c
View File

@ -181,6 +181,9 @@ int udev_watch_begin(int inotify_fd, sd_device *dev) {
assert(inotify_fd >= 0);
assert(dev);
/* Ignore the request of watching the device node on remove event, as the device node specified by
* DEVNAME= has already been removed, and may already be assigned to another device. Consider the
* case e.g. a USB stick memory was unplugged and then another one is plugged. */
if (device_for_action(dev, SD_DEVICE_REMOVE))
return 0;

6
src/udev/udev-worker.c
View File

@ -97,6 +97,12 @@ static int worker_lock_whole_disk(sd_device *dev, int *ret_fd) {
* event handling; in the case udev acquired the lock, the external process can block until udev has
* finished its event handling. */
/* Do not try to lock device on remove event, as the device node specified by DEVNAME= has already
* been removed, and may already be assigned to another device. Consider the case e.g. a USB stick
* memory was unplugged and then another one is plugged. */
if (device_for_action(dev, SD_DEVICE_REMOVE))
goto nolock;
r = udev_get_whole_disk(dev, &dev_whole_disk, &val);
if (r < 0)
return r;