diff options
Diffstat (limited to 'fs_mgr/libsnapshot/include/libsnapshot/cow_format.h')
| -rw-r--r-- | fs_mgr/libsnapshot/include/libsnapshot/cow_format.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h b/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h index 9f4ddbb61..000e5e14b 100644 --- a/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h +++ b/fs_mgr/libsnapshot/include/libsnapshot/cow_format.h @@ -26,8 +26,8 @@ static constexpr uint32_t kCowVersionMinor = 0; static constexpr uint32_t kCowVersionManifest = 2; -static constexpr size_t BLOCK_SZ = 4096; -static constexpr size_t BLOCK_SHIFT = (__builtin_ffs(BLOCK_SZ) - 1); +static constexpr uint32_t BLOCK_SZ = 4096; +static constexpr uint32_t BLOCK_SHIFT = (__builtin_ffs(BLOCK_SZ) - 1); // This header appears as the first sequence of bytes in the COW. All fields // in the layout are little-endian encoded. The on-disk layout is: @@ -138,8 +138,6 @@ struct CowOperation { // For Label operations, this is the value of the applied label. // // For Cluster operations, this is the length of the following data region - // - // For Xor operations, this is the byte location in the source image. uint64_t source; } __attribute__((packed)); @@ -150,8 +148,6 @@ static constexpr uint8_t kCowReplaceOp = 2; static constexpr uint8_t kCowZeroOp = 3; static constexpr uint8_t kCowLabelOp = 4; static constexpr uint8_t kCowClusterOp = 5; -static constexpr uint8_t kCowXorOp = 6; -static constexpr uint8_t kCowSequenceOp = 7; static constexpr uint8_t kCowFooterOp = -1; static constexpr uint8_t kCowCompressNone = 0; @@ -188,10 +184,7 @@ std::ostream& operator<<(std::ostream& os, CowOperation const& arg); int64_t GetNextOpOffset(const CowOperation& op, uint32_t cluster_size); int64_t GetNextDataOffset(const CowOperation& op, uint32_t cluster_size); -// Ops that are internal to the Cow Format and not OTA data bool IsMetadataOp(const CowOperation& op); -// Ops that have dependencies on old blocks, and must take care in their merge order -bool IsOrderedOp(const CowOperation& op); } // namespace snapshot } // namespace android |