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

udev-worker: notify device node of whole disk to manager when the disk is locked

Browse Source 
It is currently unused, but will be used later.
This commit is contained in:
Yu Watanabe
2025-05-08 04:46:01 +09:00
parent 356d44a063
commit 22750aa91e
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/udev/udev-worker.c
+22 -18
View File
@@ -86,12 +86,13 @@ irrelevant:
return 0;
}
static int worker_lock_whole_disk(sd_device *dev, int *ret_fd) {
static int worker_lock_whole_disk(UdevWorker *worker, sd_device *dev, int *ret_fd) {
_cleanup_close_ int fd = -EBADF;
sd_device *dev_whole_disk;
const char *val;
const char *whole_disk;
int r;
assert(worker);
assert(dev);
assert(ret_fd);
@@ -106,7 +107,7 @@ static int worker_lock_whole_disk(sd_device *dev, int *ret_fd) {
if (device_for_action(dev, SD_DEVICE_REMOVE))
goto nolock;
r = udev_get_whole_disk(dev, &dev_whole_disk, &val);
r = udev_get_whole_disk(dev, &dev_whole_disk, &whole_disk);
if (r < 0)
return r;
if (r == 0)
@@ -116,17 +117,29 @@ static int worker_lock_whole_disk(sd_device *dev, int *ret_fd) {
if (fd < 0) {
bool ignore = ERRNO_IS_DEVICE_ABSENT(fd);
log_device_debug_errno(dev, fd, "Failed to open '%s'%s: %m", val, ignore ? ", ignoring" : "");
log_device_debug_errno(dev, fd, "Failed to open '%s'%s: %m", whole_disk, ignore ? ", ignoring" : "");
if (!ignore)
return fd;
goto nolock;
}
if (flock(fd, LOCK_SH|LOCK_NB) < 0)
return log_device_debug_errno(dev, errno, "Failed to flock(%s): %m", val);
if (flock(fd, LOCK_SH|LOCK_NB) < 0) {
if (errno != EAGAIN)
return log_device_debug_errno(dev, errno, "Failed to flock(%s): %m", whole_disk);
log_device_debug(dev, "Successfully took flock(LOCK_SH) for %s, it will be released after the event has been processed.", val);
log_device_debug_errno(dev, errno, "Block device %s is currently locked, requeuing the event.", whole_disk);
r = sd_notifyf(/* unset_environment = */ false, "TRY_AGAIN=1\nWHOLE_DISK=%s", whole_disk);
if (r < 0) {
log_device_warning_errno(dev, r, "Failed to send notification message to manager process: %m");
(void) sd_event_exit(worker->event, r);
}
return -EAGAIN;
}
log_device_debug(dev, "Successfully took flock(LOCK_SH) for %s, it will be released after the event has been processed.", whole_disk);
*ret_fd = TAKE_FD(fd);
return 1;
@@ -186,18 +199,9 @@ static int worker_process_device(UdevWorker *worker, sd_device *dev) {
*
* The user-facing side of this: https://systemd.io/BLOCK_DEVICE_LOCKING */
_cleanup_close_ int fd_lock = -EBADF;
r = worker_lock_whole_disk(dev, &fd_lock);
if (r == -EAGAIN) {
log_device_debug(dev, "Block device is currently locked, requeuing the event.");
r = sd_notify(/* unset_environment = */ false, "TRY_AGAIN=1");
if (r < 0) {
log_device_warning_errno(dev, r, "Failed to send notification message to manager process: %m");
(void) sd_event_exit(worker->event, r);
}
r = worker_lock_whole_disk(worker, dev, &fd_lock);
if (r == -EAGAIN)
return 0;
}
if (r < 0)
return r;