OSDN Git Service

Retry adjusting the size computation for reserved blocks.
authorTao Bao <tbao@google.com>
Tue, 23 Jun 2015 18:16:05 +0000 (11:16 -0700)
committerTao Bao <tbao@google.com>
Tue, 30 Jun 2015 03:45:53 +0000 (20:45 -0700)
commitc7a6f1e4f8ff504bf617a0415b2c43ab3d339294
tree8a4b4dac6b7e46ca98d21d90286e862bce196ccf
parent2384d01c1c4c5b259840ec526ec8f5ec18cd8087
Retry adjusting the size computation for reserved blocks.

Due to the change in https://lwn.net/Articles/546473/, kernel reserves a
few extra blocks (lesser of 2% and 4096 blocks) on ext4 FS which leads to
OTA update failures. Adjust the size computation if the device has
BOARD_HAS_EXT4_RESERVED_BLOCKS := true.

It amends the last attemp in [1]. Now it computes the used blocks from the
make_ext4fs output, instead of altering its argument.

[1]: commit efbb5d2e692283be32069e808b88522727c7fe98.

Bug: 21522719
Bug: 22023465
Bug: 22174684
Change-Id: I9783a51abe6581ff5c75db81e78ac606d0f32c4c
core/Makefile
tools/releasetools/build_image.py