SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #34752 from yuwata/udev-remove-database-on-remove

Browse Source 
udev: remove database file on remove event
This commit is contained in:
Yu Watanabe
2024-10-15 13:06:00 +09:00
committed by GitHub
parent 11a8cb490f 49c46fbaf1
commit afc5a14fca
3 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/udev/udev-watch.c
+3
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;
src/udev/udev-worker.c
+18 -7
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;
@@ -200,26 +206,31 @@ static int worker_process_device(UdevWorker *worker, sd_device *dev) {
if (r < 0)
return r;
/* Process RUN=. */
udev_event_execute_run(udev_event);
if (!worker->rtnl)
/* in case rtnl was initialized */
worker->rtnl = sd_netlink_ref(udev_event->rtnl);
/* Enable watch if requested. */
if (udev_event->inotify_watch) {
r = udev_watch_begin(worker->inotify_fd, dev);
if (r < 0 && r != -ENOENT) /* The device may be already removed, ignore -ENOENT. */
log_device_warning_errno(dev, r, "Failed to add inotify watch, ignoring: %m");
}
/* Finalize database. */
r = device_add_property(dev, "ID_PROCESSING", NULL);
if (r < 0)
return log_device_warning_errno(dev, r, "Failed to remove 'ID_PROCESSING' property: %m");
/* Finalize database. But do not re-create database on remove, which has been already removed in
* event_execute_rules_on_remove(). */
if (!device_for_action(dev, SD_DEVICE_REMOVE)) {
r = device_add_property(dev, "ID_PROCESSING", NULL);
if (r < 0)
return log_device_warning_errno(dev, r, "Failed to remove 'ID_PROCESSING' property: %m");
r = device_update_db(dev);
if (r < 0)
return log_device_warning_errno(dev, r, "Failed to update database under /run/udev/data/: %m");
r = device_update_db(dev);
if (r < 0)
return log_device_warning_errno(dev, r, "Failed to update database under /run/udev/data/: %m");
}
log_device_uevent(dev, "Device processed");
return 0;