From: Harald Hoyer <harald@redhat.com>
Date: Fri, 27 May 2011 08:59:45 +0000 (+0200)
Subject: umount: log failed umounts only once at the end
X-Git-Tag: v30~28^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=31657718f5b7c39037f7b013c449100b9cf2dc21

umount: log failed umounts only once at the end
---

diff --git a/src/umount.c b/src/umount.c
index 20db612ac..67be42ea3 100644
--- a/src/umount.c
+++ b/src/umount.c
@@ -403,7 +403,7 @@ static int delete_dm(dev_t devnum) {
         return r >= 0 ? 0 : -errno;
 }
 
-static int mount_points_list_umount(MountPoint **head, bool *changed) {
+static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_error) {
         MountPoint *m, *n;
         int n_failed = 0;
 
@@ -422,7 +422,7 @@ static int mount_points_list_umount(MountPoint **head, bool *changed) {
                                 *changed = true;
 
                         mount_point_free(head, m);
-                } else {
+                } else if (log_error) {
                         log_warning("Could not unmount %s: %m", m->path);
                         n_failed++;
                 }
@@ -565,10 +565,12 @@ int umount_all(bool *changed) {
         /* retry umount, until nothing can be umounted anymore */
         do {
                 umount_changed = false;
-                r = mount_points_list_umount(&mp_list_head, &umount_changed);
+                r = mount_points_list_umount(&mp_list_head, &umount_changed, false);
                 if (umount_changed)
                         *changed = true;
         } while(umount_changed);
+        /* umount one more time with logging enabled */
+        r = mount_points_list_umount(&mp_list_head, &umount_changed, true);
         if (r <= 0)
                 goto end;