Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0edd0412 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix overlayfs on page cf page agnostic builds." into main

parents 7a813fd3 dea6f7c2

fs_mgr/fs_mgr.cpp

+8 −0
Original line number Diff line number Diff line
@@ -2316,6 +2316,14 @@ std::string fs_mgr_get_context(const std::string& mount_point) { 
    return context;

}



int fs_mgr_f2fs_ideal_block_size() {

#if defined(__i386__) || defined(__x86_64__)

    return 4096;

#else

    return getpagesize();

#endif

}



namespace android {

namespace fs_mgr {

fs_mgr/fs_mgr_overlayfs_control.cpp

+1 −3
Original line number Diff line number Diff line
@@ -387,10 +387,8 @@ bool MakeScratchFilesystem(const std::string& scratch_device) { 
    auto command = ""s;

    if (!access(kMkF2fs, X_OK) && fs_mgr_filesystem_available("f2fs")) {

        fs_type = "f2fs";

        command = kMkF2fs + " -w "s;

        command += std::to_string(getpagesize());

        command = kMkF2fs + " -b "s;

        command += std::to_string(getpagesize());

        command += std::to_string(fs_mgr_f2fs_ideal_block_size());

        command += " -f -d1 -l" + android::base::Basename(kScratchMountPoint);

    } else if (!access(kMkExt4, X_OK) && fs_mgr_filesystem_available("ext4")) {

        fs_type = "ext4";

fs_mgr/include/fs_mgr.h

+3 −0
Original line number Diff line number Diff line
@@ -137,3 +137,6 @@ bool fs_mgr_mount_overlayfs_fstab_entry(const android::fs_mgr::FstabEntry& entry 
// File name used to track if encryption was interrupted, leading to a known bad fs state

std::string fs_mgr_metadata_encryption_in_progress_file_name(

        const android::fs_mgr::FstabEntry& entry);



// Returns the ideal block size for make_f2fs. Returns -1 on failure.

int fs_mgr_f2fs_ideal_block_size();