diff options
| author | Corina Grigoras <corinac@google.com> | 2022-05-20 09:59:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-05-20 09:59:53 +0000 |
| commit | 05098fee390f2c7f170cedb2c802721d70ee2519 (patch) | |
| tree | ff458c79f8f1b51ecdbe209e0b7cc061ed0b95ab | |
| parent | c193c3fbb827e3aa53b65e5e3dbd96fc11b75701 (diff) | |
| parent | 11a666b0925efda40282a5d9df52fca93c787c6b (diff) | |
| download | vold-05098fee390f2c7f170cedb2c802721d70ee2519.tar.gz | |
Merge "Abort FUSE as part of volume reset" into tm-dev
| -rw-r--r-- | VolumeManager.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/VolumeManager.cpp b/VolumeManager.cpp index bc556ef0..a7d39c11 100644 --- a/VolumeManager.cpp +++ b/VolumeManager.cpp @@ -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; } |