commit b0f4a229e5accf499eb0a7664ec9d7e5a2b5fed9
author Paul Lawrence <paullawrence@google.com> Tue Jan 12 22:21:21 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 12 22:21:21 2016 +0000
tree 98d8d8c74d3fcd53684007e5fcdcecb5f6c8d2a8
parent 8bb8fcfb4f502ba0ed68d8169dfaca89ff85bab9
parent 9b5db9bcbe333b677ca18d2c1c398c8751cd0fd2

Merge "cryptfs: Skip to encrtypt unused blocks into a block group which uninitialize block bitmap ." am: 1ae498e0d4
am: 9b5db9bcbe

* commit '9b5db9bcbe333b677ca18d2c1c398c8751cd0fd2':
  cryptfs: Skip to encrtypt unused blocks into a block group which uninitialize block bitmap .

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index b0aafc2..3aa3403 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -2428,7 +2428,8 @@
         data->count = 0;
 
         for (block = 0; block < block_count; block++) {
-            int used = bitmap_get_bit(block_bitmap, block);
+            int used = (aux_info.bg_desc[i].bg_flags & EXT4_BG_BLOCK_UNINIT) ?
+                    0 : bitmap_get_bit(block_bitmap, block);
             update_progress(data, used);
             if (used) {
                 if (data->count == 0) {