commit d53c482d9a58c832d807239796bae044e94d5c2c
author Xin Li <delphij@google.com> Wed Mar 06 09:30:16 2024 -0800
committer Xin Li <delphij@google.com> Wed Mar 06 09:30:16 2024 -0800
tree 4b98ef550b345eb48144b073da8ee96016e4652e
parent daf7f8caed3b8bf8120d5cbaa32912870403f88d
parent 974428239d96fbfb2ff9a450cfaee75f68fdc971

Merge Android 14 QPR2 to AOSP main

Bug: 319669529
Merged-In: Ideae1065c117be2a65c0a116bde5c865f109fe51
Change-Id: Ic7a30375bea5a780362ebdf0bb2d6b7e7f9b37a3

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;