Merge pull request #16316 from yuwata/backlight-use-actual-brightness

[thirdparty/systemd.git] / src / udev / udev-watch.c

diff --git a/src/udev/udev-watch.c b/src/udev/udev-watch.c
index 3f5885c52e5b8059b74ce46958a815fa6fe1e471..68b51d04a3598ece06ab7a6c5063426b306450ee 100644 (file)
--- a/src/udev/udev-watch.c
+++ b/src/udev/udev-watch.c
@@ -9,6 +9,7 @@
 
 #include "alloc-util.h"
 #include "device-private.h"
+#include "device-util.h"
 #include "dirent-util.h"
 #include "fs-util.h"
 #include "mkdir.h"
@@ -23,7 +24,7 @@ static int inotify_fd = -1;
 int udev_watch_init(void) {
         inotify_fd = inotify_init1(IN_CLOEXEC);
         if (inotify_fd < 0)
-                return log_error_errno(errno, "Failed to create inotify descriptor: %m");
+                return -errno;
 
         return inotify_fd;
 }
@@ -35,18 +36,19 @@ int udev_watch_restore(void) {
         int r;
 
         if (inotify_fd < 0)
-                return log_error_errno(EINVAL, "Invalid inotify descriptor.");
+                return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
+                                       "Invalid inotify descriptor.");
 
         if (rename("/run/udev/watch", "/run/udev/watch.old") < 0) {
                 if (errno != ENOENT)
-                        return log_error_errno(errno, "Failed to move watches directory /run/udev/watch. Old watches will not be restored: %m");
+                        return log_warning_errno(errno, "Failed to move watches directory /run/udev/watch. Old watches will not be restored: %m");
 
                 return 0;
         }
 
         dir = opendir("/run/udev/watch.old");
         if (!dir)
-                return log_error_errno(errno, "Failed to open old watches directory /run/udev/watch.old. Old watches will not be restored: %m");
+                return log_warning_errno(errno, "Failed to open old watches directory /run/udev/watch.old. Old watches will not be restored: %m");
 
         FOREACH_DIRENT_ALL(ent, dir, break) {
                 _cleanup_(sd_device_unrefp) sd_device *dev = NULL;
@@ -57,22 +59,17 @@ int udev_watch_restore(void) {
 
                 r = readlinkat_malloc(dirfd(dir), ent->d_name, &device);
                 if (r < 0) {
-                        log_error_errno(r, "Failed to read link '/run/udev/watch.old/%s', ignoring: %m", ent->d_name);
+                        log_debug_errno(r, "Failed to read link '/run/udev/watch.old/%s', ignoring: %m", ent->d_name);
                         goto unlink;
                 }
 
                 r = sd_device_new_from_device_id(&dev, device);
                 if (r < 0) {
-                        log_error_errno(r, "Failed to create sd_device object for '%s', ignoring: %m", device);
+                        log_debug_errno(r, "Failed to create sd_device object for '%s', ignoring: %m", device);
                         goto unlink;
                 }
 
-                if (DEBUG_LOGGING) {
-                        const char *devnode = NULL;
-
-                        (void) sd_device_get_devname(dev, &devnode);
-                        log_debug("Restoring old watch on '%s'", strnull(devnode));
-                }
+                log_device_debug(dev, "Restoring old watch");
                 (void) udev_watch_begin(dev);
 unlink:
                 (void) unlinkat(dirfd(dir), ent->d_name, 0);
@@ -90,53 +87,54 @@ int udev_watch_begin(sd_device *dev) {
         int wd, r;
 
         if (inotify_fd < 0)
-                return log_error_errno(EINVAL, "Invalid inotify descriptor.");
+                return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
+                                       "Invalid inotify descriptor.");
 
         r = sd_device_get_devname(dev, &devnode);
         if (r < 0)
-                return log_error_errno(r, "Failed to get device name: %m");
+                return log_device_error_errno(dev, r, "Failed to get device name: %m");
 
-        log_debug("Adding watch on '%s'", devnode);
+        log_device_debug(dev, "Adding watch on '%s'", devnode);
         wd = inotify_add_watch(inotify_fd, devnode, IN_CLOSE_WRITE);
         if (wd < 0)
-                return log_error_errno(errno, "Failed to add device '%s' to watch: %m", devnode);
+                return log_device_full(dev,
+                                       errno == ENOENT ? LOG_DEBUG : LOG_ERR,
+                                       errno,
+                                       "Failed to add device '%s' to watch: %m", devnode);
 
         device_set_watch_handle(dev, wd);
 
         xsprintf(filename, "/run/udev/watch/%d", wd);
         r = mkdir_parents(filename, 0755);
         if (r < 0)
-                return log_error_errno(r, "Failed to create parent directory of '%s': %m", filename);
+                return log_device_error_errno(dev, r, "Failed to create parent directory of '%s': %m", filename);
         (void) unlink(filename);
 
         r = device_get_id_filename(dev, &id_filename);
         if (r < 0)
-                return log_error_errno(r, "Failed to get device id-filename: %m");
+                return log_device_error_errno(dev, r, "Failed to get device id-filename: %m");
 
         if (symlink(id_filename, filename) < 0)
-                return log_error_errno(errno, "Failed to create symlink %s: %m", filename);
+                return log_device_error_errno(dev, errno, "Failed to create symlink %s: %m", filename);
 
         return 0;
 }
 
 int udev_watch_end(sd_device *dev) {
         char filename[STRLEN("/run/udev/watch/") + DECIMAL_STR_MAX(int)];
-        const char *name = NULL;
         int wd, r;
 
         if (inotify_fd < 0)
-                return log_error_errno(EINVAL, "Invalid inotify descriptor.");
-
-        if (sd_device_get_devname(dev, &name) < 0)
-                (void) sd_device_get_syspath(dev, &name);
+                return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
+                                       "Invalid inotify descriptor.");
 
         r = device_get_watch_handle(dev, &wd);
         if (r == -ENOENT)
                 return 0;
         if (r < 0)
-                return log_error_errno(r, "Failed to get watch handle for device '%s', ignoring: %m", strnull(name));
+                return log_device_debug_errno(dev, r, "Failed to get watch handle, ignoring: %m");
 
-        log_debug("Removing watch on '%s'", strnull(name));
+        log_device_debug(dev, "Removing watch");
         (void) inotify_rm_watch(inotify_fd, wd);
 
         xsprintf(filename, "/run/udev/watch/%d", wd);
@@ -155,22 +153,25 @@ int udev_watch_lookup(int wd, sd_device **ret) {
         assert(ret);
 
         if (inotify_fd < 0)
-                return log_error_errno(EINVAL, "Invalid inotify descriptor.");
+                return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
+                                       "Invalid inotify descriptor.");
 
         if (wd < 0)
-                return log_error_errno(EINVAL, "Invalid watch handle.");
+                return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
+                                       "Invalid watch handle.");
 
         xsprintf(filename, "/run/udev/watch/%d", wd);
         r = readlink_malloc(filename, &device);
-        if (r < 0) {
-                if (r != -ENOENT)
-                        return log_error_errno(errno, "Failed to read link '%s': %m", filename);
+        if (r == -ENOENT)
                 return 0;
-        }
+        if (r < 0)
+                return log_debug_errno(r, "Failed to read link '%s': %m", filename);
 
         r = sd_device_new_from_device_id(ret, device);
+        if (r == -ENODEV)
+                return 0;
         if (r < 0)
-                return log_error_errno(r, "Failed to create sd_device object for '%s': %m", device);
+                return log_debug_errno(r, "Failed to create sd_device object for '%s': %m", device);
 
-        return 0;
+        return 1;
 }