From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 23 Sep 2020 13:28:59 +0000 (+0200)
Subject: tree-wide: port remaining umount() calls to umount_verbose()
X-Git-Tag: v247-rc1~183^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=890084db03f452673172d4fd19303548142001d5;p=thirdparty%2Fsystemd.git

tree-wide: port remaining umount() calls to umount_verbose()
---

diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index 103c82a9a4b..931e6d72325 100644
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -968,7 +968,7 @@ int bus_machine_method_bind_mount(sd_bus_message *message, void *userdata, sd_bu
                 (void) unlink(mount_tmp);
         mount_tmp_created = false;
 
-        (void) umount(mount_slave);
+        (void) umount_verbose(LOG_DEBUG, mount_slave, UMOUNT_NOFOLLOW);
         mount_slave_mounted = false;
 
         (void) rmdir(mount_slave);
@@ -1044,7 +1044,7 @@ int bus_machine_method_bind_mount(sd_bus_message *message, void *userdata, sd_bu
 
 finish:
         if (mount_outside_mounted)
-                (void) umount(mount_outside);
+                (void) umount_verbose(LOG_DEBUG, mount_outside, UMOUNT_NOFOLLOW);
         if (mount_outside_created) {
                 if (S_ISDIR(st.st_mode))
                         (void) rmdir(mount_outside);
@@ -1053,7 +1053,7 @@ finish:
         }
 
         if (mount_tmp_mounted)
-                (void) umount(mount_tmp);
+                (void) umount_verbose(LOG_DEBUG, mount_tmp, UMOUNT_NOFOLLOW);
         if (mount_tmp_created) {
                 if (S_ISDIR(st.st_mode))
                         (void) rmdir(mount_tmp);
@@ -1062,7 +1062,7 @@ finish:
         }
 
         if (mount_slave_mounted)
-                (void) umount(mount_slave);
+                (void) umount_verbose(LOG_DEBUG, mount_slave, UMOUNT_NOFOLLOW);
         if (mount_slave_created)
                 (void) rmdir(mount_slave);