diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-09-03 00:28:03 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-09-03 00:42:31 +0900 |
commit | 4fe46c349d98aee5d880f65ebbf4e9e879138346 (patch) | |
tree | b1adc6364163d3a10bebccffb868a4c449924d91 /src | |
parent | 81e327c42c26b0a716fc75718e8d5fce8f6893e2 (diff) | |
download | systemd-4fe46c349d98aee5d880f65ebbf4e9e879138346.tar.gz |
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.
Diffstat (limited to 'src')
-rw-r--r-- | src/core/swap.c | 2 | ||||
-rw-r--r-- | src/dissect/dissect.c | 2 | ||||
-rw-r--r-- | src/libsystemd/sd-device/device-util.c | 2 | ||||
-rw-r--r-- | src/libsystemd/sd-device/device-util.h | 2 | ||||
-rw-r--r-- | src/libsystemd/sd-device/test-sd-device.c | 22 | ||||
-rw-r--r-- | src/nspawn/nspawn-oci.c | 2 | ||||
-rw-r--r-- | src/partition/growfs.c | 4 | ||||
-rw-r--r-- | src/partition/repart.c | 2 | ||||
-rw-r--r-- | src/shared/find-esp.c | 4 | ||||
-rw-r--r-- | src/shared/quota-util.c | 2 | ||||
-rw-r--r-- | src/sysupdate/sysupdate-resource.c | 2 | ||||
-rw-r--r-- | src/udev/udevadm-lock.c | 2 |
12 files changed, 24 insertions, 24 deletions
diff --git a/src/core/swap.c b/src/core/swap.c index f5c65dc312..fcdba1df73 100644 --- 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 f0094a390f..2c169fcea1 100644 --- 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 f000278c75..b192914b1d 100644 --- 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 53943b8382..b9a29f6924 100644 --- 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 74fdd7b600..758a2a380d 100644 --- 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 a9a1cd33d9..a8c7b4e434 100644 --- 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 a2c95453d4..8a04071f17 100644 --- 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 bb95c0aab5..1d949696a4 100644 --- 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 d21b6742b9..61831c2dc8 100644 --- 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 5bf533ddff..4d014f847c 100644 --- 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 2a2fb29c20..8104e9c82e 100644 --- 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 07641c24c3..a3be2336af 100644 --- 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"); |