tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

IdleMaint: use fstab_default from VoldUtil

Browse source 
vold already reads the default fstab into memory when starting up, and
the default fstab isn't allowed to change later.  So in IdleMaint.cpp,
just use 'fstab_default' instead of reading it again.

This also has the advantage that fstab entries for "logical partitions"
now get a properly updated blk_device, which is needed in order to start
using blk_device to exclude virtual filesystems in addFromFstab().

Change-Id: Id6457a2b7972d01dde4bca0c5f2da86374d930af
This commit is contained in:
Eric Biggers 2020-10-15 16:54:38 -07:00
parent e9023dc7bb
commit 019d5163cc
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Checkpoint.cpp
View file

@ -47,7 +47,6 @@ using android::base::GetUintProperty;
using android::base::SetProperty; using android::base::SetProperty;
using android::binder::Status; using android::binder::Status;
using android::fs_mgr::Fstab; using android::fs_mgr::Fstab;
using android::fs_mgr::ReadDefaultFstab;
using android::fs_mgr::ReadFstabFromFile; using android::fs_mgr::ReadFstabFromFile;
using android::hardware::hidl_string; using android::hardware::hidl_string;
using android::hardware::boot::V1_0::BoolResult; using android::hardware::boot::V1_0::BoolResult;

13
IdleMaint.cpp
View file

@ -17,6 +17,7 @@
#include "IdleMaint.h" #include "IdleMaint.h"
#include "FileDeviceUtils.h" #include "FileDeviceUtils.h"
#include "Utils.h" #include "Utils.h"
#include "VoldUtil.h"
#include "VolumeManager.h" #include "VolumeManager.h"
#include "model/PrivateVolume.h" #include "model/PrivateVolume.h"
@ -45,8 +46,6 @@ using android::base::Realpath;
using android::base::StringPrintf; using android::base::StringPrintf;
using android::base::Timer; using android::base::Timer;
using android::base::WriteStringToFile; using android::base::WriteStringToFile;
using android::fs_mgr::Fstab;
using android::fs_mgr::ReadDefaultFstab;
using android::hardware::Return; using android::hardware::Return;
using android::hardware::Void; using android::hardware::Void;
using android::hardware::health::storage::V1_0::IStorage; using android::hardware::health::storage::V1_0::IStorage;
@ -104,11 +103,8 @@ static void addFromVolumeManager(std::list<std::string>* paths, PathTypes path_t
} }
static void addFromFstab(std::list<std::string>* paths, PathTypes path_type) { static void addFromFstab(std::list<std::string>* paths, PathTypes path_type) {
Fstab fstab;
ReadDefaultFstab(&fstab);
std::string previous_mount_point; std::string previous_mount_point;
for (const auto& entry : fstab) { for (const auto& entry : fstab_default) {
// Skip raw partitions. // Skip raw partitions.
if (entry.fs_type == "emmc" || entry.fs_type == "mtd") { if (entry.fs_type == "emmc" || entry.fs_type == "mtd") {
continue; continue;
@ -253,11 +249,8 @@ static int stopGc(const std::list<std::string>& paths) {
} }
static void runDevGcFstab(void) { static void runDevGcFstab(void) {
Fstab fstab;
ReadDefaultFstab(&fstab);
std::string path; std::string path;
for (const auto& entry : fstab) { for (const auto& entry : fstab_default) {
if (!entry.sysfs_path.empty()) { if (!entry.sysfs_path.empty()) {
path = entry.sysfs_path; path = entry.sysfs_path;
break; break;