diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-08-28 05:56:25 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-08-28 10:10:50 +0900 |
| commit | ca8228295ec20e561119729a2cf117e4531d7f56 (patch) | |
| tree | d31f8189834a0f126b68dcdb976b66bd4ffdbd23 /src/shared/loop-util.c | |
| parent | 42899bcee5a7ed08640e0f958fd9b48e5b21eb3d (diff) | |
| download | systemd-ca8228295ec20e561119729a2cf117e4531d7f56.tar.gz | |
tree-wide: use devpath_from_devnum() and device_open_from_devnum()
Fixes #24465.
Diffstat (limited to 'src/shared/loop-util.c')
| -rw-r--r-- | src/shared/loop-util.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/shared/loop-util.c b/src/shared/loop-util.c index fa71086741..b9c63e2e4c 100644 --- a/src/shared/loop-util.c +++ b/src/shared/loop-util.c @@ -806,7 +806,7 @@ int loop_device_open(const char *loop_path, int open_flags, LoopDevice **ret) { static int resize_partition(int partition_fd, uint64_t offset, uint64_t size) { char sysfs[STRLEN("/sys/dev/block/:/partition") + 2*DECIMAL_STR_MAX(dev_t) + 1]; - _cleanup_free_ char *whole = NULL, *buffer = NULL; + _cleanup_free_ char *buffer = NULL; uint64_t current_offset, current_size, partno; _cleanup_close_ int whole_fd = -1; struct stat st; @@ -865,14 +865,10 @@ static int resize_partition(int partition_fd, uint64_t offset, uint64_t size) { if (r < 0) return r; - r = device_path_make_major_minor(S_IFBLK, devno, &whole); + whole_fd = r = device_open_from_devnum(S_IFBLK, devno, O_RDWR|O_CLOEXEC|O_NONBLOCK|O_NOCTTY, NULL); if (r < 0) return r; - whole_fd = open(whole, O_RDWR|O_CLOEXEC|O_NONBLOCK|O_NOCTTY); - if (whole_fd < 0) - return -errno; - struct blkpg_partition bp = { .pno = partno, .start = offset == UINT64_MAX ? current_offset : offset, |