Merge "libsnapshot: v3 structural changes" into main am: a4af286e98
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2933914
Change-Id: I8a362f52f3ae191074117afce8fb99aace62ea3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h b/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h
index 9401c66..d410c14 100644
--- a/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h
+++ b/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h
@@ -101,7 +101,7 @@
// monotonically increasing value used by update_engine
uint64_t label;
// Index of last CowOperation guaranteed to be resumable
- uint32_t op_index;
+ uint64_t op_index;
} __attribute__((packed));
static constexpr uint8_t kNumResumePoints = 4;
@@ -115,10 +115,12 @@
uint32_t resume_point_max;
// Number of CowOperationV3 structs in the operation buffer, currently and total
// region size.
- uint32_t op_count;
- uint32_t op_count_max;
+ uint64_t op_count;
+ uint64_t op_count_max;
// Compression Algorithm
uint32_t compression_algorithm;
+ // Max compression size supported
+ uint32_t max_compression_size;
} __attribute__((packed));
enum class CowOperationType : uint8_t {
@@ -203,7 +205,7 @@
struct CowOperationV3 {
// If this operation reads from the data section of the COW, this contains
// the length.
- uint16_t data_length;
+ uint32_t data_length;
// The block of data in the new image that this operation modifies.
uint32_t new_block;