From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 1 Sep 2022 10:14:15 +0000 (+0200)
Subject: loop-util: use DEVNUM_FORMAT_STR more
X-Git-Tag: v252-rc1~277^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F24531%2Fhead;p=thirdparty%2Fsystemd.git

loop-util: use DEVNUM_FORMAT_STR more
---

diff --git a/src/shared/loop-util.c b/src/shared/loop-util.c
index fd68af41600..def2fa89fbb 100644
--- a/src/shared/loop-util.c
+++ b/src/shared/loop-util.c
@@ -824,7 +824,7 @@ static int resize_partition(int partition_fd, uint64_t offset, uint64_t size) {
 
         assert(S_ISBLK(st.st_mode));
 
-        xsprintf(sysfs, "/sys/dev/block/%u:%u/partition", major(st.st_rdev), minor(st.st_rdev));
+        xsprintf(sysfs, "/sys/dev/block/" DEVNUM_FORMAT_STR "/partition", DEVNUM_FORMAT_VAL(st.st_rdev));
         r = read_one_line_file(sysfs, &buffer);
         if (r == -ENOENT) /* not a partition, cannot resize */
                 return -ENOTTY;
@@ -834,7 +834,7 @@ static int resize_partition(int partition_fd, uint64_t offset, uint64_t size) {
         if (r < 0)
                 return r;
 
-        xsprintf(sysfs, "/sys/dev/block/%u:%u/start", major(st.st_rdev), minor(st.st_rdev));
+        xsprintf(sysfs, "/sys/dev/block/" DEVNUM_FORMAT_STR "/start", DEVNUM_FORMAT_VAL(st.st_rdev));
 
         buffer = mfree(buffer);
         r = read_one_line_file(sysfs, &buffer);
@@ -855,7 +855,7 @@ static int resize_partition(int partition_fd, uint64_t offset, uint64_t size) {
         if (current_size == size && current_offset == offset)
                 return 0;
 
-        xsprintf(sysfs, "/sys/dev/block/%u:%u/../dev", major(st.st_rdev), minor(st.st_rdev));
+        xsprintf(sysfs, "/sys/dev/block/" DEVNUM_FORMAT_STR "/../dev", DEVNUM_FORMAT_VAL(st.st_rdev));
 
         buffer = mfree(buffer);
         r = read_one_line_file(sysfs, &buffer);