| commit | 83f5476b3d9e51ea185570079fbe8f53eca69a2b | [log] [tgz] |
|---|---|---|
| author | Yo Chiang <yochiang@google.com> | Thu Feb 18 09:33:02 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 18 09:33:02 2021 +0000 |
| tree | d29203a792348989907f15569889fe289691dc7d | |
| parent | 9a2bf07d51d980d51a453a0ba0b0a9f45fe0c847 [diff] | |
| parent | 10a8797ce039a4647da45200760e033087cb7b87 [diff] |
Merge "Explicitly cast to 64bit integer when calculating filesystem size" am: 10a8797ce0 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1586546 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8ec41c5a46d589c0bbec7fc40ab839a171fbf8a4
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;