commit b99a9e4f2168d0fb8581040af23fbf475b9041d1
author Tao Wu <lepton@google.com> Wed Jan 19 04:31:27 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 19 04:31:27 2022 +0000
tree 6720aa19a8bb3808eedecaa1a909db656f2ed5ed
parent 73876a2c289e6419e58e7309d0f1a6f160089b6a
parent a6e700b054f76adff7e0b13b02c059c93fc1bbe7

Merge "Don't abort fuse connections for virtiofs." am: 09997fe28a am: a6e700b054

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

Change-Id: Ib1b19a472d1808104c19015265c2137648101b35

Utils.cpp

diff --git a/Utils.cpp b/Utils.cpp
index f9f3058..17fee28 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -1442,6 +1442,17 @@
     namespace fs = std::filesystem;
 
     for (const auto& itEntry : fs::directory_iterator("/sys/fs/fuse/connections")) {
+        std::string fsPath = itEntry.path().string() + "/filesystem";
+        std::string fs;
+
+        // Virtiofs is on top of fuse and there isn't any user space daemon.
+        // Android user space doesn't manage it.
+        if (android::base::ReadFileToString(fsPath, &fs, false) &&
+            android::base::Trim(fs) == "virtiofs") {
+            LOG(INFO) << "Ignore virtiofs connection entry " << itEntry.path().string();
+            continue;
+        }
+
         std::string abortPath = itEntry.path().string() + "/abort";
         LOG(DEBUG) << "Aborting fuse connection entry " << abortPath;
         bool ret = writeStringToFile("1", abortPath);