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

Commit 41e03dc1 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "remount: Create a bigger scratch partition on /data." am: c2b2bf35 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1989238

Change-Id: Iddb064bfcfa9614be0ec3584eccab3e66b49ee9d
parents 21f1ae2f c2b2bf35

fs_mgr/fs_mgr_overlayfs.cpp

+21 −10
Original line number Original line Diff line number Diff line
@@ -1122,6 +1122,23 @@ static bool CreateDynamicScratch(std::string* scratch_device, bool* partition_ex 
    return true;

    return true;

}

}





static inline uint64_t GetIdealDataScratchSize() {

    BlockDeviceInfo super_info;

    PartitionOpener opener;

    if (!opener.GetInfo(fs_mgr_get_super_partition_name(), &super_info)) {

        LERROR << "could not get block device info for super";

        return 0;

    }



    struct statvfs s;

    if (statvfs("/data", &s) < 0) {

        PERROR << "could not statfs /data";

        return 0;

    }



    return std::min(super_info.size, (uint64_t(s.f_frsize) * s.f_bfree) / 2);

}



static bool CreateScratchOnData(std::string* scratch_device, bool* partition_exists, bool* change) {

static bool CreateScratchOnData(std::string* scratch_device, bool* partition_exists, bool* change) {

    *partition_exists = false;

    *partition_exists = false;

    if (change) *change = false;

    if (change) *change = false;
@@ -1137,13 +1154,6 @@ static bool CreateScratchOnData(std::string* scratch_device, bool* partition_exi 
        return true;

        return true;

    }

    }





    BlockDeviceInfo info;

    PartitionOpener opener;

    if (!opener.GetInfo(fs_mgr_get_super_partition_name(), &info)) {

        LERROR << "could not get block device info for super";

        return false;

    }



    if (change) *change = true;

    if (change) *change = true;





    // Note: calling RemoveDisabledImages here ensures that we do not race with

    // Note: calling RemoveDisabledImages here ensures that we do not race with
@@ -1153,10 +1163,11 @@ static bool CreateScratchOnData(std::string* scratch_device, bool* partition_exi 
        return false;

        return false;

    }

    }

    if (!images->BackingImageExists(partition_name)) {

    if (!images->BackingImageExists(partition_name)) {

        static constexpr uint64_t kMinimumSize = 64_MiB;

        uint64_t size = GetIdealDataScratchSize();

        static constexpr uint64_t kMaximumSize = 2_GiB;

        if (!size) {

            size = 2_GiB;

        }





        uint64_t size = std::clamp(info.size / 2, kMinimumSize, kMaximumSize);

        auto flags = IImageManager::CREATE_IMAGE_DEFAULT;

        auto flags = IImageManager::CREATE_IMAGE_DEFAULT;





        if (!images->CreateBackingImage(partition_name, size, flags)) {

        if (!images->CreateBackingImage(partition_name, size, flags)) {