Merge "vold: do not acquire lock when abort fuse"

This commit is contained in:
Martijn Coenen 2021-03-19 08:21:00 +00:00 committed by Gerrit Code Review
commit 717c1926fc

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());
}