From 975cb23bb8646805a8af44e640a292f7f0be46df Mon Sep 17 00:00:00 2001 From: Paul Lawrence Date: Tue, 26 Jan 2021 13:31:08 -0800 Subject: [PATCH] Revert "ANDROID: Incremental fs: Remove block HASH flag" This reverts commit 8ac8eb342e2ddb8f6476a6cc4104440ceda8b011. Set incfs back to rvc shipping incfs Bug: 178509184 Test: incfs_test passes Signed-off-by: Paul Lawrence Change-Id: I58d91c7b2cd32de30bdf02cea2ffbcdc9947456a --- fs/incfs/format.c | 1 + fs/incfs/format.h | 1 + 2 files changed, 2 insertions(+) diff --git a/fs/incfs/format.c b/fs/incfs/format.c index 0b15317ca74d..f663a7605727 100644 --- a/fs/incfs/format.c +++ b/fs/incfs/format.c @@ -456,6 +456,7 @@ int incfs_write_hash_block_to_backing_file(struct backing_file_context *bfc, bm_entry.me_data_offset_lo = cpu_to_le32((u32)data_offset); bm_entry.me_data_offset_hi = cpu_to_le16((u16)(data_offset >> 32)); bm_entry.me_data_size = cpu_to_le16(INCFS_DATA_FILE_BLOCK_SIZE); + bm_entry.me_flags = cpu_to_le16(INCFS_BLOCK_HASH); return write_to_bf(bfc, &bm_entry, sizeof(bm_entry), bm_entry_off); } diff --git a/fs/incfs/format.h b/fs/incfs/format.h index 626796cce214..67b0af003b05 100644 --- a/fs/incfs/format.h +++ b/fs/incfs/format.h @@ -186,6 +186,7 @@ struct incfs_file_header { enum incfs_block_map_entry_flags { INCFS_BLOCK_COMPRESSED_LZ4 = (1 << 0), + INCFS_BLOCK_HASH = (1 << 1), }; /* Block map entry pointing to an actual location of the data block. */