commit 158a5b92b76abb91a91a53a7571a0edadcf422fe
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Aug 11 01:32:36 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 11 01:32:36 2023 +0000
tree 62a31b0c5d580bf45b131b5f9b736680824a6566
parent f5a31a2573874a3f0f44c767f55df3ef5b81a11c
parent 8848b13d84f6fcc1c3e5bdc2ece46fdaa510be9b

Merge "incremental_delivery: Remove PAGE_SIZE usage" into main am: 0951db5595 am: 45bdd29b32 am: 8fea35ef6f am: abd5c1c112 am: 8848b13d84

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

Change-Id: I59b78d5402bc3c3054676cf9246c0bb781537854
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;