commit e803e63bc50e47c19cfcd3d8243a8f7a81e0cfb0
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat May 21 01:11:15 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat May 21 01:11:15 2022 +0000
tree 76e6f9b8e55197af1e0773496ddb6bf470a7f11e
parent 52e10682f9871ecb519b780b7fa418a269fb750f
parent baee102002073e746756840dac1dcb6f03d3dfe5

Snap for 8624184 from baee102002073e746756840dac1dcb6f03d3dfe5 to tm-release

Change-Id: I0be4becfd6ef6b8863eae7f301b3dff9fd8910ab

IdleMaint.cpp

diff --git a/IdleMaint.cpp b/IdleMaint.cpp
index 2bfe3d9..426be58 100644
--- a/IdleMaint.cpp
+++ b/IdleMaint.cpp
@@ -450,17 +450,17 @@
         stopGc(paths);
     }
 
+    if (!gc_aborted) {
+        Trim(nullptr);
+        runDevGc();
+    }
+
     lk.lock();
     idle_maint_stat = IdleMaintStats::kStopped;
     lk.unlock();
 
     cv_stop.notify_one();
 
-    if (!gc_aborted) {
-        Trim(nullptr);
-        runDevGc();
-    }
-
     if (listener) {
         android::os::PersistableBundle extras;
         listener->onFinished(0, extras);

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index bc556ef..a7d39c1 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -914,6 +914,10 @@
     updateVirtualDisk();
     mAddedUsers.clear();
     mStartedUsers.clear();
+
+    // Abort all FUSE connections to avoid deadlocks if the FUSE daemon was killed
+    // with FUSE fds open.
+    abortFuse();
     return 0;
 }