ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "fs_mgr: overlayfs takes const std::vector<const fstab_rec*>&"

Browse source
This commit is contained in:
Treehugger Robot 2018-10-31 17:52:18 +00:00 • committed by Gerrit Code Review
commit 1206850289
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
fs_mgr/fs_mgr_overlayfs.cpp
View file

@ -61,10 +61,18 @@ bool fs_mgr_overlayfs_mount_all(fstab*) {
return false;
}
bool fs_mgr_overlayfs_mount_all(const std::vector<const fstab_rec*>&) {
return false;
}
std::vector<std::string> fs_mgr_overlayfs_required_devices(fstab*) {
return {};
}
std::vector<std::string> fs_mgr_overlayfs_required_devices(const std::vector<const fstab_rec*>&) {
return {};
}
bool fs_mgr_overlayfs_setup(const char*, const char*, bool* change) {
if (change) *change = false;
return false;
@ -764,6 +772,13 @@ bool fs_mgr_overlayfs_mount_all(fstab* fstab) {
return ret;
}
bool fs_mgr_overlayfs_mount_all(const std::vector<const fstab_rec*>& fsrecs) {
std::vector<fstab_rec> recs;
for (const auto& rec : fsrecs) recs.push_back(*rec);
fstab fstab = {static_cast<int>(fsrecs.size()), &recs[0]};
return fs_mgr_overlayfs_mount_all(&fstab);
}
std::vector<std::string> fs_mgr_overlayfs_required_devices(fstab* fstab) {
if (fs_mgr_get_entry_for_mount_point(const_cast<struct fstab*>(fstab), kScratchMountPoint)) {
return {};
@ -778,6 +793,14 @@ std::vector<std::string> fs_mgr_overlayfs_required_devices(fstab* fstab) {
return {};
}
std::vector<std::string> fs_mgr_overlayfs_required_devices(
const std::vector<const fstab_rec*>& fsrecs) {
std::vector<fstab_rec> recs;
for (const auto& rec : fsrecs) recs.push_back(*rec);
fstab fstab = {static_cast<int>(fsrecs.size()), &recs[0]};
return fs_mgr_overlayfs_required_devices(&fstab);
}
// Returns false if setup not permitted, errno set to last error.
// If something is altered, set *change.
bool fs_mgr_overlayfs_setup(const char* backing, const char* mount_point, bool* change) {

3
fs_mgr/include/fs_mgr_overlayfs.h
View file

@ -22,7 +22,10 @@
#include <vector>
bool fs_mgr_overlayfs_mount_all(fstab* fstab);
bool fs_mgr_overlayfs_mount_all(const std::vector<const fstab_rec*>& fstab);
std::vector<std::string> fs_mgr_overlayfs_required_devices(fstab* fstab);
std::vector<std::string> fs_mgr_overlayfs_required_devices(
const std::vector<const fstab_rec*>& fstab);
bool fs_mgr_overlayfs_setup(const char* backing = nullptr, const char* mount_point = nullptr,
bool* change = nullptr);
bool fs_mgr_overlayfs_teardown(const char* mount_point = nullptr, bool* change = nullptr);