From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 26 Oct 2018 23:06:40 +0000 (+0900)
Subject: udev: drop redundant log message and fix returned error code
X-Git-Tag: v240~412^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b7759e040339f8adfd8c6184e16b8b7e14fbfd7f;p=thirdparty%2Fsystemd.git

udev: drop redundant log message and fix returned error code
---

diff --git a/src/udev/udev-watch.c b/src/udev/udev-watch.c
index 4924b75c504..1d3d9f1c083 100644
--- a/src/udev/udev-watch.c
+++ b/src/udev/udev-watch.c
@@ -24,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;
 }
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 7ec30b92c37..42c88781868 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1578,9 +1578,10 @@ static int manager_new(Manager **ret, int fd_ctrl, int fd_uevent, const char *cg
         if (r < 0)
                 return log_error_errno(r, "could not enable SO_PASSCRED: %m");
 
-        manager->fd_inotify = udev_watch_init();
-        if (manager->fd_inotify < 0)
-                return log_error_errno(ENOMEM, "error initializing inotify");
+        r = udev_watch_init();
+        if (r < 0)
+                return log_error_errno(r, "Failed to create inotify descriptor: %m");
+        manager->fd_inotify = r;
 
         udev_watch_restore();