summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2024-03-06 09:30:16 -0800
committerXin Li <delphij@google.com>2024-03-06 09:30:16 -0800
commitd53c482d9a58c832d807239796bae044e94d5c2c (patch)
tree4b98ef550b345eb48144b073da8ee96016e4652e
parentdaf7f8caed3b8bf8120d5cbaa32912870403f88d (diff)
parent974428239d96fbfb2ff9a450cfaee75f68fdc971 (diff)
downloadincremental_delivery-main.tar.gz
Merge Android 14 QPR2 to AOSP mainHEADmastermain
Bug: 319669529 Merged-In: Ideae1065c117be2a65c0a116bde5c865f109fe51 Change-Id: Ic7a30375bea5a780362ebdf0bb2d6b7e7f9b37a3
-rw-r--r--incfs/incfs.cpp4
1 files changed, 3 insertions, 1 deletions
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 @@ IncFsErrorCode IncFs_Unmount(const char* dir) {
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;