From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 28 Apr 2022 13:33:29 +0000 (+0900)
Subject: core/device: drop unused unit name generated from path
X-Git-Tag: v251-rc2~44^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=42ebcebfef2e0dfcf1bb57dbec28b9aacd9bba92;p=thirdparty%2Fsystemd.git

core/device: drop unused unit name generated from path
---

diff --git a/src/core/device.c b/src/core/device.c
index 3e0fd76f5e6..cc65b8580df 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -868,10 +868,13 @@ static void device_propagate_reload_by_sysfs(Manager *m, const char *sysfs) {
 }
 
 static void device_remove_old_on_move(Manager *m, sd_device *dev) {
-        _cleanup_free_ char *syspath_old = NULL, *e = NULL;
+        _cleanup_free_ char *syspath_old = NULL;
         const char *devpath_old;
         int r;
 
+        assert(m);
+        assert(dev);
+
         r = sd_device_get_property_value(dev, "DEVPATH_OLD", &devpath_old);
         if (r < 0)
                 return (void) log_device_debug_errno(dev, r, "Failed to get DEVPATH_OLD= property on 'move' uevent, ignoring: %m");
@@ -880,10 +883,6 @@ static void device_remove_old_on_move(Manager *m, sd_device *dev) {
         if (!syspath_old)
                 return (void) log_oom();
 
-        r = unit_name_from_path(syspath_old, ".device", &e);
-        if (r < 0)
-                return (void) log_device_debug_errno(dev, r, "Failed to generate unit name from old device path, ignoring: %m");
-
         device_update_found_by_sysfs(m, syspath_old, 0, DEVICE_FOUND_UDEV|DEVICE_FOUND_MOUNT|DEVICE_FOUND_SWAP);
 }