diff options
author | Oleksiy Avramchenko <oleksiy.avramchenko@sonymobile.com> | 2015-10-01 12:44:46 +0200 |
---|---|---|
committer | Jeff Sharkey <jsharkey@android.com> | 2015-10-21 16:01:29 -0700 |
commit | 2403b4d0561c756ed5102aaf6048a80c9993f6f8 (patch) | |
tree | 08a7bf090d2c78815b5a01e0541618a287e088ea | |
parent | 89f74fbf2529d708534c041d2b711af0f1feff9f (diff) | |
download | vold-marshmallow-mr1-dev.tar.gz |
Promote free bytes calculation to 64 bitsandroid-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r17android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41marshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-dev
The expression otherwise overflows for large devices.
It's fsblkcnt_t -> unsigned long, which is 32 bit on ARMv7.
Bug: 25162062
Change-Id: I46c5e00558b7dbd6abd50fae4727396079044df2
-rw-r--r-- | Utils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -432,7 +432,7 @@ status_t NormalizeHex(const std::string& in, std::string& out) { uint64_t GetFreeBytes(const std::string& path) { struct statvfs sb; if (statvfs(path.c_str(), &sb) == 0) { - return sb.f_bfree * sb.f_bsize; + return (uint64_t)sb.f_bfree * sb.f_bsize; } else { return -1; } |