commit 8563d538ef8003a9b568ec47a98d175b4c7ea8d4
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 20 05:24:30 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 20 05:24:30 2020 +0000
tree 896b9499b6ef28814276102bb00a50f13d20397e
parent fb31a66d583f4c00b8d81c2d3da54b427d423d35
parent 43f7db57f63e958c28fde3dbf896c20f694f0fe5

Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 34d72f126b am: 43f7db57f6

Change-Id: I9ef2acf09fe51567184ec9aee508c98170424d96

model/PrivateVolume.cpp

diff --git a/model/PrivateVolume.cpp b/model/PrivateVolume.cpp
index e146633..39a946c 100644
--- a/model/PrivateVolume.cpp
+++ b/model/PrivateVolume.cpp
@@ -39,6 +39,7 @@
 #include <thread>
 
 using android::base::StringPrintf;
+using android::vold::IsVirtioBlkDevice;
 
 namespace android {
 namespace vold {
@@ -210,9 +211,10 @@
     if (fsType == "auto") {
         // For now, assume that all MMC devices are flash-based SD cards, and
         // give everyone else ext4 because sysfs rotational isn't reliable.
-        // Additionally, prefer f2fs for loop-bases devices
-        if ((major(mRawDevice) == kMajorBlockMmc || major(mRawDevice) == kMajorBlockLoop) &&
-            f2fs::IsSupported()) {
+        // Additionally, prefer f2fs for loop-based devices
+        if ((major(mRawDevice) == kMajorBlockMmc ||
+             major(mRawDevice) == kMajorBlockLoop ||
+             IsVirtioBlkDevice(major(mRawDevice))) && f2fs::IsSupported()) {
             resolvedFsType = "f2fs";
         } else {
             resolvedFsType = "ext4";