Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d9110ec authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow Cow version v3 to be used" into main am: f7fffb62 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2856178



Change-Id: I819247c40c8d92ff8ba74bd18da44c32acc33fa4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5e3a8ab8 f7fffb62

fs_mgr/libsnapshot/include/libsnapshot/cow_format.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static constexpr uint32_t kCowVersionMinor = 0; 
static constexpr uint32_t kCowVersionManifest = 2;



static constexpr uint32_t kMinCowVersion = 1;

static constexpr uint32_t kMaxCowVersion = 2;

static constexpr uint32_t kMaxCowVersion = 3;



// Normally, this should be kMaxCowVersion. When a new version is under testing

// it may be the previous value of kMaxCowVersion.

fs_mgr/libsnapshot/snapshot.cpp

+3 −0
Original line number Diff line number Diff line
@@ -3642,6 +3642,9 @@ std::unique_ptr<ICowWriter> SnapshotManager::OpenCompressedSnapshotWriter( 
    cow_options.max_blocks = {status.device_size() / cow_options.block_size};

    cow_options.batch_write = status.batched_writes();

    cow_options.num_compress_threads = status.enable_threading() ? 2 : 0;

    // TODO(b/313962438) Improve op_count estimate. For now, use number of

    // blocks as an upper bound.

    cow_options.op_count_max = status.device_size() / cow_options.block_size;

    // Disable scratch space for vts tests

    if (device()->IsTestDevice()) {

        cow_options.scratch_space = false;