diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-11-22 03:43:57 +0100 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-11-24 06:17:22 +0100 |
| commit | 95a45a87d6425864b8fc962b45efc7d1f92bc593 (patch) | |
| tree | fe505f09acf821820d3c5f5d448ffd4dd184dde0 | |
| parent | systemctl: edit: write override files as text files (diff) | |
| download | systemd-95a45a87d6425864b8fc962b45efc7d1f92bc593.tar.xz systemd-95a45a87d6425864b8fc962b45efc7d1f92bc593.zip | |
mount: make acquire_mount_where_for_loop_dev() take sd-device object
No functional change, just refactoring.
| -rw-r--r-- | src/mount/mount-tool.c | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c index 95dcf1bab0..72570f6fa6 100644 --- a/src/mount/mount-tool.c +++ b/src/mount/mount-tool.c @@ -1136,24 +1136,31 @@ static int acquire_mount_where(sd_device *d) { return 1; } -static int acquire_mount_where_for_loop_dev(const char *loop_dev) { +static int acquire_mount_where_for_loop_dev(sd_device *dev) { _cleanup_strv_free_ char **list = NULL; + const char *node; int r; + assert(dev); + if (arg_mount_where) return 0; - r = find_mount_points(loop_dev, &list); + r = sd_device_get_devname(dev, &node); if (r < 0) return r; - else if (r == 0) - return log_error_errno(SYNTHETIC_ERRNO(EINVAL), - "Can't find mount point of %s. It is expected that %s is already mounted on a place.", - loop_dev, loop_dev); - else if (r >= 2) - return log_error_errno(SYNTHETIC_ERRNO(EINVAL), - "%s is mounted on %d places. It is expected that %s is mounted on a place.", - loop_dev, r, loop_dev); + + r = find_mount_points(node, &list); + if (r < 0) + return r; + if (r == 0) + return log_device_error_errno(dev, SYNTHETIC_ERRNO(EINVAL), + "Can't find mount point of %s. It is expected that %s is already mounted on a place.", + node, node); + if (r >= 2) + return log_device_error_errno(dev, SYNTHETIC_ERRNO(EINVAL), + "%s is mounted on %d places. It is expected that %s is mounted on a place.", + node, r, node); arg_mount_where = strdup(list[0]); if (!arg_mount_where) @@ -1288,7 +1295,7 @@ static int discover_loop_backing_file(void) { if (r < 0) return r; - r = acquire_mount_where_for_loop_dev(loop_dev); + r = acquire_mount_where_for_loop_dev(d); if (r < 0) return r; |