From 921961c3a3d3301af290e69e132a5667c1d68355 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 14 Nov 2023 11:58:22 +0900 Subject: 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. --- src/storagetm/storagetm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/storagetm') diff --git a/src/storagetm/storagetm.c b/src/storagetm/storagetm.c index c9f6dd9214..ae63baaf79 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); -- cgit v1.2.3