diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-09-02 17:28:03 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-09-02 17:42:31 +0200 |
| commit | 4fe46c349d98aee5d880f65ebbf4e9e879138346 (patch) | |
| tree | b1adc6364163d3a10bebccffb868a4c449924d91 /src/shared | |
| parent | Merge pull request #24491 from poettering/compare-order (diff) | |
| download | systemd-4fe46c349d98aee5d880f65ebbf4e9e879138346.tar.xz systemd-4fe46c349d98aee5d880f65ebbf4e9e879138346.zip | |
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/shared')
| -rw-r--r-- | src/shared/find-esp.c | 4 | ||||
| -rw-r--r-- | src/shared/quota-util.c | 2 |
2 files changed, 3 insertions, 3 deletions
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; |