| commit | 97c642cc99edea2ba8210ba51dbb1618844d0df2 | [log] [tgz] |
|---|---|---|
| author | Corina Grigoras <corinac@google.com> | Fri May 20 12:43:50 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 20 12:43:50 2022 +0000 |
| tree | 8d05f234e14feedcfc081e8b36291e7f07aa4d88 | |
| parent | 684554549d21b8ecb457cb494e608e07b9d20d1e [diff] | |
| parent | 05098fee390f2c7f170cedb2c802721d70ee2519 [diff] |
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>
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; }