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

udev-watch: do not try to remove invalid watch handle

Browse Source 
When a new device is processed, there should be no watch handle for
the device, hence udev_watch_clear() provides -1. Let's not try to call
inotify_rm_watch() in that case.

This should not change any behavior. Just for suppressing spurious
debugging log:
=====
(udev-worker)[3626140]: zram1: Removing watch handle -1.
=====

(cherry picked from commit b3b442062045eac61a9dd3ed73b650dfb5be0b46)
This commit is contained in:
Yu Watanabe 2025-02-12 09:23:33 +09:00 committed by Luca Boccassi
parent cc77e140a8
commit d32f4bcaf2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,7 +161,7 @@ static int udev_watch_clear(sd_device *dev, int dirfd, int *ret_wd) {
if (ret_wd)
*ret_wd = wd;
r = 0;
r = 1;
finalize:
/* 5. remove symlink ID -> wd.
@ -249,7 +249,7 @@ int udev_watch_end(int inotify_fd, sd_device *dev) {
/* First, clear symlinks. */
r = udev_watch_clear(dev, dirfd, &wd);
if (r < 0)
if (r <= 0)
return r;
/* Then, remove inotify watch. */