Merge "Abort FUSE as part of volume reset" into tm-dev am: 05098fee39

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

Change-Id: Ie48a761a1b173f66e3cddbae6f965148c7a18645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Corina Grigoras 2022-05-20 12:43:50 +00:00 committed by Automerger Merge Worker
commit 97c642cc99

View file

@ -914,6 +914,10 @@ int VolumeManager::reset() {
updateVirtualDisk(); updateVirtualDisk();
mAddedUsers.clear(); mAddedUsers.clear();
mStartedUsers.clear(); mStartedUsers.clear();
// Abort all FUSE connections to avoid deadlocks if the FUSE daemon was killed
// with FUSE fds open.
abortFuse();
return 0; return 0;
} }