| commit | 4707ce169d0a07dc636b19cbd01b414ca0ca5ca1 | [log] [tgz] |
|---|---|---|
| author | Yo Chiang <yochiang@google.com> | Thu Feb 18 10:09:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 18 10:09:48 2021 +0000 |
| tree | 03a0abe113cc35ddda0438f71fb275ecb8e02417 | |
| parent | cd369c3cec686f9f2ea1964d3f01cbd036f07363 [diff] | |
| parent | 83f5476b3d9e51ea185570079fbe8f53eca69a2b [diff] |
Merge "Explicitly cast to 64bit integer when calculating filesystem size" am: 10a8797ce0 am: 83f5476b3d Original change: https://android-review.googlesource.com/c/platform/system/core/+/1586546 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibe4b041bf28881c21a683ca6d9c42944e098c928
diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp index cdbadc9..1134f14 100644 --- a/fs_mgr/fs_mgr_overlayfs.cpp +++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -194,7 +194,7 @@ static constexpr unsigned long kSizeThreshold = 8 * 1024 * 1024; // 8MB return (vst.f_bfree >= (vst.f_blocks * kPercentThreshold / 100)) && - (vst.f_bfree * vst.f_bsize) >= kSizeThreshold; + (static_cast<uint64_t>(vst.f_bfree) * vst.f_frsize) >= kSizeThreshold; } const auto kPhysicalDevice = "/dev/block/by-name/"s;