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

Commit 6f7fb5a0 authored by Daniel Zheng's avatar Daniel Zheng Committed by Gerrit Code Review
Browse files

Merge "libsnapshot: remove hard coded cow version" into main

parents b46dcf4f 885bd1c8

fs_mgr/libsnapshot/include/libsnapshot/cow_format.h

+0 −6
Original line number Diff line number Diff line
@@ -31,15 +31,9 @@ static constexpr uint64_t kCowMagicNumber = 0x436f77634f572121ULL; 
static constexpr uint32_t kCowVersionMajor = 2;

static constexpr uint32_t kCowVersionMinor = 0;



static constexpr uint32_t kCowVersionManifest = 2;



static constexpr uint32_t kMinCowVersion = 1;

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.

static constexpr uint32_t kDefaultCowVersion = 2;



// 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:

//

fs_mgr/libsnapshot/libsnapshot_cow/snapshot_reader_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ TEST_F(OfflineSnapshotTest, CompressedSnapshot) { 
    unique_fd cow_fd(dup(cow_->fd));

    ASSERT_GE(cow_fd, 0);



    auto writer = CreateCowWriter(kDefaultCowVersion, options, std::move(cow_fd));

    auto writer = CreateCowWriter(2, options, std::move(cow_fd));

    ASSERT_NO_FATAL_FAILURE(WriteCow(writer.get()));

    ASSERT_NO_FATAL_FAILURE(TestReads(writer.get()));

}

fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ std::unique_ptr<ICowWriter> SnapuserdTestBase::CreateCowDeviceInternal() { 
    unique_fd fd(cow_system_->fd);

    cow_system_->fd = -1;



    return CreateCowWriter(kDefaultCowVersion, options, std::move(fd));

    return CreateCowWriter(2, options, std::move(fd));

}



std::unique_ptr<ICowWriter> SnapuserdTestBase::CreateV3Cow() {