From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 2 Jun 2021 13:34:03 +0000 (+0200)
Subject: pid1: eat up errors in device_update_found_by_name()
X-Git-Tag: v249-rc1~103^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68695ce4d688022ff5b86a13155bd8aa8ec91d55;p=thirdparty%2Fsystemd.git

pid1: eat up errors in device_update_found_by_name()

We eat up all errors in the caller already, and rightly so.
---

diff --git a/src/core/device.c b/src/core/device.c
index 62a987dea7a..cceeb1fe7e2 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -721,7 +721,7 @@ static void device_update_found_by_sysfs(Manager *m, const char *sysfs, DeviceFo
                 device_update_found_one(d, found, mask);
 }
 
-static int device_update_found_by_name(Manager *m, const char *path, DeviceFound found, DeviceFound mask) {
+static void device_update_found_by_name(Manager *m, const char *path, DeviceFound found, DeviceFound mask) {
         _cleanup_free_ char *e = NULL;
         Unit *u;
         int r;
@@ -730,18 +730,17 @@ static int device_update_found_by_name(Manager *m, const char *path, DeviceFound
         assert(path);
 
         if (mask == 0)
-                return 0;
+                return;
 
         r = unit_name_from_path(path, ".device", &e);
         if (r < 0)
-                return log_error_errno(r, "Failed to generate unit name from device path: %m");
+                return (void) log_debug_errno(r, "Failed to generate unit name from device path, ignoring: %m");
 
         u = manager_get_unit(m, e);
         if (!u)
-                return 0;
+                return;
 
         device_update_found_one(DEVICE(u), found, mask);
-        return 0;
 }
 
 static bool device_is_ready(sd_device *dev) {