commit 505580b45502b94595f5d4ba2054d4ff5a74605c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Dec 05 02:58:13 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 05 02:58:13 2024 +0000
tree c74c97b8faaed5787657b4ff1484190b00ef604f
parent 9fdcefd0f7438330f4cadf5563f8d7e9d612b27e
parent b9b56884a5461eeb74d6bb28f481800772ca2860

Merge "Add support for F2FS format for HDD device storage" into main am: b9b56884a5

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

Change-Id: I3cf4236a65ffadec6fc7f0ea8b8032f66497af95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

model/PrivateVolume.cpp

diff --git a/model/PrivateVolume.cpp b/model/PrivateVolume.cpp
index b2128a8..0f06c1f 100644
--- a/model/PrivateVolume.cpp
+++ b/model/PrivateVolume.cpp
@@ -45,6 +45,7 @@
 namespace vold {
 
 static const unsigned int kMajorBlockLoop = 7;
+static const unsigned int kMajorBlockHdd = 8;
 static const unsigned int kMajorBlockMmc = 179;
 
 PrivateVolume::PrivateVolume(dev_t device, const KeyBuffer& keyRaw)
@@ -218,6 +219,7 @@
         // give everyone else ext4 because sysfs rotational isn't reliable.
         // Additionally, prefer f2fs for loop-based devices
         if ((major(mRawDevice) == kMajorBlockMmc ||
+             major(mRawDevice) == kMajorBlockHdd ||
              major(mRawDevice) == kMajorBlockLoop ||
              IsVirtioBlkDevice(major(mRawDevice))) && f2fs::IsSupported()) {
             resolvedFsType = "f2fs";