From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 22 Feb 2021 16:37:39 +0000 (+0100)
Subject: tree-wide: use sd_device_new_from_stat_rdev() whereever appropriate
X-Git-Tag: v248-rc1~13^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=930aa88f0448c90595a57a7b8b0307b14cdb011a;p=thirdparty%2Fsystemd.git

tree-wide: use sd_device_new_from_stat_rdev() whereever appropriate
---

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index 2df7633dac7..ebfef02aee2 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -436,7 +436,7 @@ static char* disk_description(const char *path) {
         if (!S_ISBLK(st.st_mode))
                 return NULL;
 
-        if (sd_device_new_from_devnum(&device, 'b', st.st_rdev) < 0)
+        if (sd_device_new_from_stat_rdev(&device, &st) < 0)
                 return NULL;
 
         NULSTR_FOREACH(i, name_fields)
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index 584d441c942..cd7adfaeb96 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -287,7 +287,7 @@ static int run(int argc, char *argv[]) {
                                                "%s is not a block device.",
                                                device);
 
-                r = sd_device_new_from_devnum(&dev, 'b', st.st_rdev);
+                r = sd_device_new_from_stat_rdev(&dev, &st);
                 if (r < 0)
                         return log_error_errno(r, "Failed to detect device %s: %m", device);
 
diff --git a/src/home/homed-home.c b/src/home/homed-home.c
index 2ea0f7c81d9..f1db828ed0e 100644
--- a/src/home/homed-home.c
+++ b/src/home/homed-home.c
@@ -2711,7 +2711,7 @@ static int home_get_image_path_seat(Home *h, char **ret) {
         if (!S_ISBLK(st.st_mode))
                 return -ENOTBLK;
 
-        r = sd_device_new_from_devnum(&d, 'b', st.st_rdev);
+        r = sd_device_new_from_stat_rdev(&d, &st);
         if (r < 0)
                 return r;
 
diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c
index 153f67f93b3..4a8f46761a6 100644
--- a/src/mount/mount-tool.c
+++ b/src/mount/mount-tool.c
@@ -929,7 +929,7 @@ static int umount_by_device(sd_bus *bus, const char *what) {
                 return log_error_errno(SYNTHETIC_ERRNO(ENOTBLK),
                                        "Not a block device: %s", what);
 
-        r = sd_device_new_from_devnum(&d, 'b', st.st_rdev);
+        r = sd_device_new_from_stat_rdev(&d, &st);
         if (r < 0)
                 return log_error_errno(r, "Failed to get device from device number: %m");
 
@@ -1270,7 +1270,7 @@ static int discover_loop_backing_file(void) {
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
                                        "Invalid file type: %s", loop_dev);
 
-        r = sd_device_new_from_devnum(&d, 'b', st.st_rdev);
+        r = sd_device_new_from_stat_rdev(&d, &st);
         if (r < 0)
                 return log_error_errno(r, "Failed to get device from device number: %m");
 
@@ -1314,7 +1314,7 @@ static int discover_device(void) {
                                        "Invalid file type: %s",
                                        arg_mount_what);
 
-        r = sd_device_new_from_devnum(&d, 'b', st.st_rdev);
+        r = sd_device_new_from_stat_rdev(&d, &st);
         if (r < 0)
                 return log_error_errno(r, "Failed to get device from device number: %m");
 
diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 8de17382645..791d747136e 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -532,7 +532,7 @@ int dissect_image(
         if (!S_ISBLK(st.st_mode))
                 return -ENOTBLK;
 
-        r = sd_device_new_from_devnum(&d, 'b', st.st_rdev);
+        r = sd_device_new_from_stat_rdev(&d, &st);
         if (r < 0)
                 return r;
 
diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c
index 80b70c18a03..9d732dca2cd 100644
--- a/src/shared/udev-util.c
+++ b/src/shared/udev-util.c
@@ -136,7 +136,7 @@ static int device_new_from_dev_path(const char *devlink, sd_device **ret_device)
                 return log_error_errno(SYNTHETIC_ERRNO(ENOTBLK),
                                        "%s does not point to a block device: %m", devlink);
 
-        r = sd_device_new_from_devnum(ret_device, 'b', st.st_rdev);
+        r = sd_device_new_from_stat_rdev(ret_device, &st);
         if (r < 0)
                 return log_error_errno(r, "Failed to initialize device from %s: %m", devlink);