commit 696cb7d973a3bcaf57614b7c09fea94f583ffd72
author Sophia Coldren <coldren@google.com> Thu Sep 14 15:11:05 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 14 15:11:05 2023 +0000
tree 88b0e9631e594ce2770b092f24446cce07263e72
parent 158a5b92b76abb91a91a53a7571a0edadcf422fe
parent bd09615d7b0ff6b0227e53c05db9e190fd7e018f

Add an include am: 8e4bf657ea am: 2335353b9e am: df1cfef23b am: 1a1cc6b12e am: bd09615d7b

Original change: https://android-review.googlesource.com/c/platform/system/incremental_delivery/+/2751124

Change-Id: I81d33b6e75a7c201e5c5d080802b52dedc4b84e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

incfs/incfs.cpp

diff --git a/incfs/incfs.cpp b/incfs/incfs.cpp
index e12b530..8953b77 100644
--- a/incfs/incfs.cpp
+++ b/incfs/incfs.cpp
@@ -1409,9 +1409,11 @@
     errno = 0;
     if (::umount2(dir, MNT_FORCE) == 0 || errno == EINVAL || errno == ENOENT) {
         // EINVAL - not a mount point, ENOENT - doesn't exist at all
+        if (errno == 0) {
+            LOG(INFO) << __func__ << ": succeeded on the first try for '" << dir << '\'';
+        }
         return -errno;
     }
-    PLOG(WARNING) << __func__ << ": umount(force) failed, detaching '" << dir << '\'';
     errno = 0;
     if (!::umount2(dir, MNT_DETACH)) {
         return 0;