commit 3741a1635b0bfd975e708e690c0ca7bc6a3f91f8
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Apr 25 11:09:13 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 25 11:09:13 2023 +0000
tree 6dadaeb30b1541f8e83ec4ef801ae8449922cd48
parent e9eee2b50ee65d3386dcdf609b95261a6ebed80f
parent 823898eca392e11495bcd4ff7251870fe4baf662

Merge "[vold] Add mount lazy if forcemount fail." am: 823898eca3

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1764385

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

model/PublicVolume.cpp

diff --git a/model/PublicVolume.cpp b/model/PublicVolume.cpp
index b13a0ea..034fb23 100644
--- a/model/PublicVolume.cpp
+++ b/model/PublicVolume.cpp
@@ -300,8 +300,15 @@
         mSdcardFsWrite.clear();
         mSdcardFsFull.clear();
     }
-    ForceUnmount(mRawPath);
-    rmdir(mRawPath.c_str());
+
+    if (ForceUnmount(mRawPath) != 0){
+        umount2(mRawPath.c_str(),MNT_DETACH);
+        PLOG(INFO) << "use umount lazy if force unmount fail";
+    }
+    if(rmdir(mRawPath.c_str()) != 0) {
+        PLOG(INFO) << "rmdir mRawPath=" << mRawPath << " fail";
+        KillProcessesUsingPath(getPath());
+    }
     mRawPath.clear();
 
     return OK;