commit ceb3275fe4cba2ffecf3d23d76c543555877149e
author Chris Fries <cfries@google.com> Wed Apr 19 19:31:07 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 19 19:31:07 2017 +0000
tree 598ff4217a2d371673eeb3cecc0188a8686bf27a
parent 26fcd29bb1f11c36dc100e513936e951fe8da2ce
parent 92e082e381a956f12e430a5cf24376be11efe884

Merge "libsparse: Fix odd-sized input files total_blks" am: 652ce94f40 am: ab74c778df am: cbd8d9d4f5
am: 221af0990b

Change-Id: I7e12ac2f354fb545cf8e2c7e648350632797fb19

libsparse/output_file.c

diff --git a/libsparse/output_file.c b/libsparse/output_file.c
index 2115998..51e60ef 100644
--- a/libsparse/output_file.c
+++ b/libsparse/output_file.c
@@ -584,7 +584,7 @@
 				.file_hdr_sz = SPARSE_HEADER_LEN,
 				.chunk_hdr_sz = CHUNK_HEADER_LEN,
 				.blk_sz = out->block_size,
-				.total_blks = out->len / out->block_size,
+				.total_blks = DIV_ROUND_UP(out->len, out->block_size),
 				.total_chunks = chunks,
 				.image_checksum = 0
 		};