Merge "vold: do not acquire lock when abort fuse"
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());
}