From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 14 Nov 2023 02:58:22 +0000 (+0900)
Subject: storagetm: use path to device node instead of devpath
X-Git-Tag: v255-rc2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=921961c3a3d3301af290e69e132a5667c1d68355;p=thirdparty%2Fsystemd.git

storagetm: use path to device node instead of devpath

To make the generated IDs equivalent when
- sd_device object is not provided,
- sd_device object is provided, but it does not have ID_SERIAL.

Follow-up for abc19a6ffaa94893ffc40cc000e5bb4437f67656.

This also fixes missing voidification.

Fixes CID#1524253.
---

diff --git a/src/storagetm/storagetm.c b/src/storagetm/storagetm.c
index c9f6dd9214e..ae63baaf792 100644
--- a/src/storagetm/storagetm.c
+++ b/src/storagetm/storagetm.c
@@ -326,8 +326,9 @@ static int nvme_namespace_write_metadata(int namespace_fd, sd_device *device, co
                 if (device) {
                         (void) sd_device_get_property_value(device, "ID_SERIAL", &serial);
                         if (!serial)
-                                sd_device_get_devpath(device, &serial);
-                } else
+                                (void) sd_device_get_devname(device, &serial);
+                }
+                if (!serial)
                         serial = node;
 
                 r = sd_id128_get_machine(&mid);