| commit | d616d6e1ba9898da178e5f886ff5b92ca523c06c | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Fri Mar 19 08:42:45 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 19 08:42:45 2021 +0000 |
| tree | 491ac09d414e052110893cd286361fe69e64f660 | |
| parent | 209084f877cefb4a873c5cc97b18a4922d395b65 [diff] | |
| parent | 717c1926fcdc8d3b1e3de923d78c93ee65de13b6 [diff] |
Merge "vold: do not acquire lock when abort fuse" am: 717c1926fc Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1639945 Change-Id: I137677f0625e3d46cc8d5a50aa3327e274676589
diff --git a/VoldNativeService.cpp b/VoldNativeService.cpp index b7f1749..b6224da 100644 --- a/VoldNativeService.cpp +++ b/VoldNativeService.cpp
@@ -178,7 +178,9 @@ binder::Status VoldNativeService::abortFuse() { ENFORCE_SYSTEM_OR_ROOT; - ACQUIRE_LOCK; + // if acquire lock, maybe lead to a deadlock if lock is held by a + // thread that is blocked on a FUSE operation. + // abort fuse doesn't need to access any state, so do not acquire lock return translate(VolumeManager::Instance()->abortFuse()); }