Merge "vold: do not acquire lock when abort fuse" am: 717c1926fc am: d616d6e1ba am: c678a95db2

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1639945

Change-Id: I7c52c6ce39a37ce8fbc719fd8f242d2106e344bf
This commit is contained in:
Martijn Coenen 2021-03-19 09:44:14 +00:00 committed by Automerger Merge Worker
commit bca322d931

View file

@ -178,7 +178,9 @@ binder::Status VoldNativeService::shutdown() {
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());
}