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

Commit 136d398b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix overflow issue when computing ideal size of scratch partition" am: eb8079e6 

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



Change-Id: I30a5580d2e8720b47b8051b1cbace5937c9dc2f5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 722e6ca3 eb8079e6

fs_mgr/fs_mgr_overlayfs.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1083,7 +1083,7 @@ static inline uint64_t GetIdealDataScratchSize() { 
        return 0;

    }



    auto ideal_size = std::min(super_info.size, uint64_t(s.f_frsize * s.f_bfree * 0.85));

    auto ideal_size = std::min(super_info.size, uint64_t(uint64_t(s.f_frsize) * s.f_bfree * 0.85));



    // Align up to the filesystem block size.

    if (auto remainder = ideal_size % s.f_bsize; remainder > 0) {