82 lines
2.9 KiB
Diff
82 lines
2.9 KiB
Diff
From 82a5de9fd289e1d9b109528bcdddb74534e1a4bf Mon Sep 17 00:00:00 2001
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
Date: Fri, 25 Mar 2022 02:56:58 +0900
|
|
Subject: [PATCH] udev: assume block device is not locked when a new event is
|
|
queued
|
|
|
|
Then, hopefully, previously requeued events are processed earlier.
|
|
|
|
Reference:https://github.com/systemd/systemd/commit/82a5de9fd289e1d9b109528bcdddb74534e1a4bf
|
|
Conflict:adaption
|
|
|
|
---
|
|
src/udev/udevd.c | 40 +++++++++++++++++++++++++++++++++++++++-
|
|
1 file changed, 39 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
|
|
index eebb2f8..e0f70cc 100644
|
|
--- a/src/udev/udevd.c
|
|
+++ b/src/udev/udevd.c
|
|
@@ -1033,6 +1033,40 @@ static int event_requeue(Event *event) {
|
|
return 0;
|
|
}
|
|
|
|
+static int event_queue_assume_block_device_unlocked(Manager *manager, sd_device *dev) {
|
|
+ const char *devname;
|
|
+ Event * event;
|
|
+ int r;
|
|
+
|
|
+ /* When a new event for a block device is queued or we get an inotify event, assume that the
|
|
+ * device is not locked anymore. The assumption may not be true, but that should not cause any
|
|
+ * issues, as in that case events will be requeued soon. */
|
|
+
|
|
+ r = device_get_block_device(dev, &devname);
|
|
+ if (r <= 0)
|
|
+ return r;
|
|
+
|
|
+ LIST_FOREACH(event, event, manager->events) {
|
|
+ const char *event_devname;
|
|
+
|
|
+ if (event->state != EVENT_QUEUED)
|
|
+ continue;
|
|
+
|
|
+ if (event->retry_again_next_usec == 0)
|
|
+ continue;
|
|
+
|
|
+ if (device_get_block_device(event->dev, &event_devname) <= 0)
|
|
+ continue;
|
|
+
|
|
+ if (!streq(devname, event_devname))
|
|
+ continue;
|
|
+
|
|
+ event->retry_again_next_usec = 0;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static int event_queue_insert(Manager *manager, sd_device *dev) {
|
|
sd_device_action_t action;
|
|
uint64_t seqnum;
|
|
@@ -1095,6 +1129,8 @@ static int on_uevent(sd_device_monitor *monitor, sd_device *dev, void *userdata)
|
|
return 1;
|
|
}
|
|
|
|
+ (void) event_queue_assume_block_device_unlocked(manager, dev);
|
|
+
|
|
/* we have fresh events, try to schedule them */
|
|
event_queue_start(manager);
|
|
|
|
@@ -1426,8 +1462,10 @@ static int on_inotify(sd_event_source *s, int fd, uint32_t revents, void *userda
|
|
continue;
|
|
|
|
log_device_debug(dev, "Inotify event: %x for %s", e->mask, devnode);
|
|
- if (e->mask & IN_CLOSE_WRITE)
|
|
+ if (e->mask & IN_CLOSE_WRITE) {
|
|
+ (void) event_queue_assume_block_device_unlocked(manager, dev);
|
|
(void) synthesize_change(dev);
|
|
+ }
|
|
|
|
/* Do not handle IN_IGNORED here. It should be handled by worker in 'remove' uevent;
|
|
* udev_event_execute_rules() -> event_execute_rules_on_remove() -> udev_watch_end(). */
|