From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 22 Oct 2018 03:39:51 +0000 (+0900)
Subject: fsck: use log_device_*()
X-Git-Tag: v240~485^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7bd33dbd6ee6372846f8e894f883f86c51b3addb;p=thirdparty%2Fsystemd.git

fsck: use log_device_*()
---

diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index 9030708db09..65928ed2e35 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -347,7 +347,7 @@ int main(int argc, char *argv[]) {
 
                 r = sd_device_get_devname(dev, &device);
                 if (r < 0) {
-                        log_error_errno(r, "Failed to detect device node of root directory: %m");
+                        log_device_error_errno(dev, r, "Failed to detect device node of root directory: %m");
                         goto finish;
                 }
 
@@ -357,9 +357,9 @@ int main(int argc, char *argv[]) {
         if (sd_device_get_property_value(dev, "ID_FS_TYPE", &type) >= 0) {
                 r = fsck_exists(type);
                 if (r < 0)
-                        log_warning_errno(r, "Couldn't detect if fsck.%s may be used for %s, proceeding: %m", type, device);
+                        log_device_warning_errno(dev, r, "Couldn't detect if fsck.%s may be used, proceeding: %m", type);
                 else if (r == 0) {
-                        log_info("fsck.%s doesn't exist, not checking file system on %s.", type, device);
+                        log_device_info(dev, "fsck.%s doesn't exist, not checking file system.", type);
                         goto finish;
                 }
         }