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: Ic5140ae4b9d4a54a85403ebbcf812086910a7bc3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
c06c93aa35
1 changed files with 4 additions and 0 deletions
|
@ -914,6 +914,10 @@ int VolumeManager::reset() {
|
|||
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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue