sd-device: rename devpath_from_devnum() -> devname_from_devnum()

In sd-device, `devpath` is a kind of syspath without '/sys' prefix, e.g.
/devices/pci0000:00/0000:00:1c.4/0000:3c:00.0/nvme/nvme0/nvme0n1,
and `devname` is a path to the device node, e.g. /dev/nvme0n1.

Let's use the consistent name for the helper function.

diff --git a/src/core/swap.c b/src/core/swap.c
index f5c65dc3120322e2a16b1bde42bd52cff8422d36..fcdba1df73f1ff98c8223d969686d7a3e2826d77 100644 (file)
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -304,7 +304,7 @@ static int swap_load_devnode(Swap *s) {
         if (stat(s->what, &st) < 0 || !S_ISBLK(st.st_mode))
                 return 0;
 
-        r = devpath_from_devnum(S_IFBLK, st.st_rdev, &p);
+        r = devname_from_devnum(S_IFBLK, st.st_rdev, &p);
         if (r < 0) {
                 log_unit_full_errno(UNIT(s), r == -ENOENT ? LOG_DEBUG : LOG_WARNING, r,
                                     "Failed to get device node for swap %s: %m", s->what);

diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index f0094a390f7e0d70f64b6d6ab2bee74663b48533..2c169fcea1bc006a415f299ce478785bfb9af58a 100644 (file)
--- a/src/dissect/dissect.c
+++ b/src/dissect/dissect.c
@@ -880,7 +880,7 @@ static int action_umount(const char *path) {
         if (r < 0)
                 return log_error_errno(r, "Failed to find backing block device for '%s': %m", canonical);
 
-        r = devpath_from_devnum(S_IFBLK, devno, &devname);
+        r = devname_from_devnum(S_IFBLK, devno, &devname);
         if (r < 0)
                 return log_error_errno(r, "Failed to get devname of block device " DEVNUM_FORMAT_STR ": %m",
                                        DEVNUM_FORMAT_VAL(devno));

diff --git a/src/libsystemd/sd-device/device-util.c b/src/libsystemd/sd-device/device-util.c
index f000278c755a0572b81f8819407aeadcb538fe5b..b192914b1d09eeaf5aa5c48a567e621e14494c55 100644 (file)
--- a/src/libsystemd/sd-device/device-util.c
+++ b/src/libsystemd/sd-device/device-util.c
@@ -6,7 +6,7 @@
 #include "fd-util.h"
 #include "string-util.h"
 
-int devpath_from_devnum(mode_t mode, dev_t devnum, char **ret) {
+int devname_from_devnum(mode_t mode, dev_t devnum, char **ret) {
         _cleanup_(sd_device_unrefp) sd_device *dev = NULL;
         _cleanup_free_ char *s = NULL;
         const char *devname;

diff --git a/src/libsystemd/sd-device/device-util.h b/src/libsystemd/sd-device/device-util.h
index 53943b838222263056c4a03ebd19cc4a5b0f20af..b9a29f692484cf480e9d27e539cf3e9830241222 100644 (file)
--- a/src/libsystemd/sd-device/device-util.h
+++ b/src/libsystemd/sd-device/device-util.h
@@ -81,5 +81,5 @@
 #define log_device_warning_errno(device, error, ...) log_device_full_errno(device, LOG_WARNING, error, __VA_ARGS__)
 #define log_device_error_errno(device, error, ...)   log_device_full_errno(device, LOG_ERR, error, __VA_ARGS__)
 
-int devpath_from_devnum(mode_t mode, dev_t devnum, char **ret);
+int devname_from_devnum(mode_t mode, dev_t devnum, char **ret);
 int device_open_from_devnum(mode_t mode, dev_t devnum, int flags, char **ret);

diff --git a/src/libsystemd/sd-device/test-sd-device.c b/src/libsystemd/sd-device/test-sd-device.c
index 74fdd7b600956c07dfcc741886b15b7d8c66c302..758a2a380d2e6614324870a316865293da8dea06 100644 (file)
--- a/src/libsystemd/sd-device/test-sd-device.c
+++ b/src/libsystemd/sd-device/test-sd-device.c
@@ -500,7 +500,7 @@ TEST(sd_device_new_from_path) {
         }
 }
 
-static void test_devpath_from_devnum_one(const char *path) {
+static void test_devname_from_devnum_one(const char *path) {
         _cleanup_free_ char *resolved = NULL;
         struct stat st;
 
@@ -512,21 +512,21 @@ static void test_devpath_from_devnum_one(const char *path) {
                 return;
         }
 
-        assert_se(devpath_from_devnum(st.st_mode, st.st_rdev, &resolved) >= 0);
+        assert_se(devname_from_devnum(st.st_mode, st.st_rdev, &resolved) >= 0);
         assert_se(path_equal(path, resolved));
 }
 
-TEST(devpath_from_devnum) {
-        test_devpath_from_devnum_one("/dev/null");
-        test_devpath_from_devnum_one("/dev/zero");
-        test_devpath_from_devnum_one("/dev/full");
-        test_devpath_from_devnum_one("/dev/random");
-        test_devpath_from_devnum_one("/dev/urandom");
-        test_devpath_from_devnum_one("/dev/tty");
+TEST(devname_from_devnum) {
+        test_devname_from_devnum_one("/dev/null");
+        test_devname_from_devnum_one("/dev/zero");
+        test_devname_from_devnum_one("/dev/full");
+        test_devname_from_devnum_one("/dev/random");
+        test_devname_from_devnum_one("/dev/urandom");
+        test_devname_from_devnum_one("/dev/tty");
 
         if (is_device_node("/run/systemd/inaccessible/blk") > 0) {
-                test_devpath_from_devnum_one("/run/systemd/inaccessible/chr");
-                test_devpath_from_devnum_one("/run/systemd/inaccessible/blk");
+                test_devname_from_devnum_one("/run/systemd/inaccessible/chr");
+                test_devname_from_devnum_one("/run/systemd/inaccessible/blk");
         }
 }
 

diff --git a/src/nspawn/nspawn-oci.c b/src/nspawn/nspawn-oci.c
index a9a1cd33d985c22e44eaa35bda627795db11bee0..a8c7b4e43461bf5468f3321b0016521d967d54c4 100644 (file)
--- a/src/nspawn/nspawn-oci.c
+++ b/src/nspawn/nspawn-oci.c
@@ -900,7 +900,7 @@ static int oci_devices(const char *name, JsonVariant *v, JsonDispatchFlags flags
                         }
 
                         /* Suppress a couple of implicit device nodes */
-                        r = devpath_from_devnum(node->mode, makedev(node->major, node->minor), &path);
+                        r = devname_from_devnum(node->mode, makedev(node->major, node->minor), &path);
                         if (r < 0)
                                 json_log(e, flags|JSON_DEBUG, 0, "Failed to resolve device node %u:%u, ignoring: %m", node->major, node->minor);
                         else {

diff --git a/src/partition/growfs.c b/src/partition/growfs.c
index a2c95453d4632485e6c7fb506654ecceccb3410d..8a04071f170c435c38413c63869bf00206f2b517 100644 (file)
--- a/src/partition/growfs.c
+++ b/src/partition/growfs.c
@@ -55,7 +55,7 @@ static int resize_crypt_luks_device(dev_t devno, const char *fstype, dev_t main_
 
         log_debug("%s is %"PRIu64" bytes", main_devpath, size);
 
-        r = devpath_from_devnum(S_IFBLK, devno, &devpath);
+        r = devname_from_devnum(S_IFBLK, devno, &devpath);
         if (r < 0)
                 return log_error_errno(r, "Failed to get devpath of " DEVNUM_FORMAT_STR ": %m",
                                        DEVNUM_FORMAT_VAL(devno));
@@ -117,7 +117,7 @@ static int maybe_resize_underlying_device(
         if (devno == main_devno)
                 return 0;
 
-        r = devpath_from_devnum(S_IFBLK, devno, &devpath);
+        r = devname_from_devnum(S_IFBLK, devno, &devpath);
         if (r < 0)
                 return log_error_errno(r, "Failed to get devpath for block device " DEVNUM_FORMAT_STR ": %m",
                                        DEVNUM_FORMAT_VAL(devno));

diff --git a/src/partition/repart.c b/src/partition/repart.c
index bb95c0aab53be02a26fbf3b480aefa30c6ca7374..1d949696a4f9857a5e2bab67f0a2d61795455168 100644 (file)
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -4508,7 +4508,7 @@ static int acquire_root_devno(
         if (r < 0)
                 log_debug_errno(r, "Failed to find whole disk block device for '%s', ignoring: %m", p);
 
-        r = devpath_from_devnum(S_IFBLK, devno, ret);
+        r = devname_from_devnum(S_IFBLK, devno, ret);
         if (r < 0)
                 return log_debug_errno(r, "Failed to determine canonical path for '%s': %m", p);
 

diff --git a/src/shared/find-esp.c b/src/shared/find-esp.c
index d21b6742b9b6b1d5eb23dee278da9608f983366b..61831c2dc84b904a7e0ceb04518f997ba1af528f 100644 (file)
--- a/src/shared/find-esp.c
+++ b/src/shared/find-esp.c
@@ -45,7 +45,7 @@ static int verify_esp_blkid(
         const char *v;
         int r;
 
-        r = devpath_from_devnum(S_IFBLK, devid, &node);
+        r = devname_from_devnum(S_IFBLK, devid, &node);
         if (r < 0)
                 return log_error_errno(r, "Failed to get device path for " DEVNUM_FORMAT_STR ": %m", DEVNUM_FORMAT_VAL(devid));
 
@@ -508,7 +508,7 @@ static int verify_xbootldr_blkid(
         const char *type, *v;
         int r;
 
-        r = devpath_from_devnum(S_IFBLK, devid, &node);
+        r = devname_from_devnum(S_IFBLK, devid, &node);
         if (r < 0)
                 return log_error_errno(r, "Failed to get block device path for " DEVNUM_FORMAT_STR ": %m",
                                        DEVNUM_FORMAT_VAL(devid));

diff --git a/src/shared/quota-util.c b/src/shared/quota-util.c
index 5bf533ddff7bf408e9bf3200e85caee582f2a5ff..4d014f847ceb1676c258c86938f71880c04344b2 100644 (file)
--- a/src/shared/quota-util.c
+++ b/src/shared/quota-util.c
@@ -15,7 +15,7 @@ int quotactl_devnum(int cmd, dev_t devnum, int id, void *addr) {
         /* Like quotactl() but takes a dev_t instead of a path to a device node, and fixes caddr_t → void*,
          * like we should, today */
 
-        r = devpath_from_devnum(S_IFBLK, devnum, &devnode);
+        r = devname_from_devnum(S_IFBLK, devnum, &devnode);
         if (r < 0)
                 return r;
 

diff --git a/src/sysupdate/sysupdate-resource.c b/src/sysupdate/sysupdate-resource.c
index 2a2fb29c20d62540cf758c42dc02d66b33a9c85a..8104e9c82e97fdc118f0d7aca7af030b76af0a7b 100644 (file)
--- a/src/sysupdate/sysupdate-resource.c
+++ b/src/sysupdate/sysupdate-resource.c
@@ -608,7 +608,7 @@ int resource_resolve_path(
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
                                        "File system is not placed on a partition block device, cannot determine whole block device backing root file system.");
 
-        r = devpath_from_devnum(S_IFBLK, d, &p);
+        r = devname_from_devnum(S_IFBLK, d, &p);
         if (r < 0)
                 return r;
 

diff --git a/src/udev/udevadm-lock.c b/src/udev/udevadm-lock.c
index 07641c24c31ee14bef9360763db0f2af8d71654b..a3be2336afeea6a270e64e55cf6196c5cafde822 100644 (file)
--- a/src/udev/udevadm-lock.c
+++ b/src/udev/udevadm-lock.c
@@ -321,7 +321,7 @@ int lock_main(int argc, char *argv[], void *userdata) {
         for (size_t i = 0; i < n_devnos; i++) {
                 _cleanup_free_ char *node = NULL;
 
-                r = devpath_from_devnum(S_IFBLK, devnos[i], &node);
+                r = devname_from_devnum(S_IFBLK, devnos[i], &node);
                 if (r < 0)
                         return log_error_errno(r, "Failed to format block device path: %m");