commit d625abfda2352dc26b645ab2ebe710e7750fe9ae
author Treehugger Robot <treehugger-gerrit@google.com> Wed May 20 07:08:04 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 20 07:08:04 2020 +0000
tree b66e6ac51b9aa713961c2e60f6ef1d8832484bec
parent edb596fc36ae0535c8095304c0716eca0a632ed9
parent e471d11d464735f8d979aac7f1d90d1ae9d74c72

Merge "Handle virtio in private fs mapping" am: e471d11d46

Change-Id: If088b875ff4cbca66fe9c6f9224b437edc85dae8

model/PrivateVolume.cpp

diff --git a/model/PrivateVolume.cpp b/model/PrivateVolume.cpp
index fd3daea..ba221a4 100644
--- a/model/PrivateVolume.cpp
+++ b/model/PrivateVolume.cpp
@@ -38,6 +38,7 @@
 #include <sys/wait.h>
 
 using android::base::StringPrintf;
+using android::vold::IsVirtioBlkDevice;
 
 namespace android {
 namespace vold {
@@ -178,7 +179,8 @@
     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.
-        if ((major(mRawDevice) == kMajorBlockMmc) && f2fs::IsSupported()) {
+        if ((major(mRawDevice) == kMajorBlockMmc ||
+             IsVirtioBlkDevice(major(mRawDevice))) && f2fs::IsSupported()) {
             resolvedFsType = "f2fs";
         } else {
             resolvedFsType = "ext4";