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:
commit
97c642cc99
1 changed files with 4 additions and 0 deletions
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue