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

Merge "fs_mgr: overlayfs: check if scratch device is ext4 dedupe"

Browse source
This commit is contained in:
Treehugger Robot 2020-07-17 19:32:19 +00:00 • committed by Gerrit Code Review
commit a22e74cd4e
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
fs_mgr/fs_mgr_overlayfs.cpp
View file

@ -809,15 +809,26 @@ bool fs_mgr_overlayfs_mount_scratch(const std::string& device_path, const std::s
entry.fs_type = mnt_type;
if ((mnt_type == "f2fs") && !f2fs) entry.fs_type = "ext4";
if ((mnt_type == "ext4") && !ext4) entry.fs_type = "f2fs";
entry.flags = MS_NOATIME;
if (readonly) {
entry.flags |= MS_RDONLY;
} else {
entry.flags = MS_NOATIME | MS_RDONLY;
auto mounted = true;
if (!readonly) {
if (entry.fs_type == "ext4") {
// check if ext4 de-dupe
entry.flags |= MS_RDONLY;
auto save_errno = errno;
mounted = fs_mgr_do_mount_one(entry) == 0;
if (mounted) {
mounted = !fs_mgr_has_shared_blocks(entry.mount_point, entry.blk_device);
fs_mgr_overlayfs_umount_scratch();
}
errno = save_errno;
}
entry.flags &= ~MS_RDONLY;
fs_mgr_set_blk_ro(device_path, false);
}
entry.fs_mgr_flags.check = true;
auto save_errno = errno;
auto mounted = fs_mgr_do_mount_one(entry) == 0;
if (mounted) mounted = fs_mgr_do_mount_one(entry) == 0;
if (!mounted) {
if ((entry.fs_type == "f2fs") && ext4) {
entry.fs_type = "ext4";