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

Merge "fs_mgr: fs_mgr_overlayfs_mount_scratch try alternate"

Browse source
This commit is contained in:
Treehugger Robot 2018-10-18 19:21:41 +00:00 • committed by Gerrit Code Review
commit 224263da96
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
fs_mgr/fs_mgr_overlayfs.cpp
View file

@ -589,8 +589,18 @@ bool fs_mgr_overlayfs_mount_scratch(const std::string& device_path, const std::s
fsrec->fs_type = strdup(mnt_type.c_str()); fsrec->fs_type = strdup(mnt_type.c_str());
fsrec->flags = MS_RELATIME; fsrec->flags = MS_RELATIME;
fsrec->fs_options = strdup(""); fsrec->fs_options = strdup("");
auto mounted = fs_mgr_do_mount_one(fsrec) == 0;
auto save_errno = errno; auto save_errno = errno;
auto mounted = fs_mgr_do_mount_one(fsrec) == 0;
if (!mounted) {
free(fsrec->fs_type);
if (mnt_type == "f2fs") {
fsrec->fs_type = strdup("ext4");
} else {
fsrec->fs_type = strdup("f2fs");
}
mounted = fs_mgr_do_mount_one(fsrec) == 0;
if (!mounted) save_errno = errno;
}
setfscreatecon(nullptr); setfscreatecon(nullptr);
if (!mounted) rmdir(kScratchMountPoint.c_str()); if (!mounted) rmdir(kScratchMountPoint.c_str());
errno = save_errno; errno = save_errno;
@ -600,6 +610,7 @@ bool fs_mgr_overlayfs_mount_scratch(const std::string& device_path, const std::s
const std::string kMkF2fs("/system/bin/make_f2fs"); const std::string kMkF2fs("/system/bin/make_f2fs");
const std::string kMkExt4("/system/bin/mke2fs"); const std::string kMkExt4("/system/bin/mke2fs");
// Only a suggestion for _first_ try during mounting
std::string fs_mgr_overlayfs_scratch_mount_type() { std::string fs_mgr_overlayfs_scratch_mount_type() {
if (!access(kMkF2fs.c_str(), X_OK)) return "f2fs"; if (!access(kMkF2fs.c_str(), X_OK)) return "f2fs";
if (!access(kMkExt4.c_str(), X_OK)) return "ext4"; if (!access(kMkExt4.c_str(), X_OK)) return "ext4";