commit b81a3c0fbe4d7fd00d92cc36adebb5090e85ee0f
author Yi Kong <yikong@google.com> Wed Dec 06 19:19:54 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 06 19:19:54 2023 +0000
tree a6189abd0dbd1530778b7d12a4b71c3ffe1636a5
parent 7ecda84d6dca685774c22d87666800708b871bc7
parent 716f75b651be1c1d9e0ae0d4d734edae8d81397c

Fix -Wfortify-source compiler warning am: 16111f1abb am: 8414dd9fe4 am: 716f75b651

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

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