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 .
9 years ago · b0f4a229e5
parent 8bb8fcfb4f 9b5db9bcbe
commit b0f4a229e5
1 changed files with 2 additions and 1 deletions
--- a/cryptfs.c
+++ b/cryptfs.c
@ -2428,7 +2428,8 @@ static int encrypt_groups(struct encryptGroupsData* data)
        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) {