| commit | 73383ddb7f443a764cd890d9f7cbf59ee8768d0f | [log] [tgz] |
|---|---|---|
| author | Zimuzo Ezeozue <zezeozue@google.com> | Fri May 20 12:45:14 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 20 12:45:14 2022 +0000 |
| tree | fd08ab7f32383beb7bf94c63b0ddc6a42dd894af | |
| parent | d7237292e32401685f5595b5e1222c3dce27fd4c [diff] | |
| parent | 3712b8de010853b68673b34de24eb6a7fe697983 [diff] |
Merge "Abort FUSE as part of volume reset" am: 3712b8de01 Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2101651 Change-Id: I7e4e62ee8b89168c03ab86071a8e7e109958906b 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; }