tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libsnapshot: remove hard coded cow version

Browse source 
Remove hard coded global variables referencing cow version in
libsnapshot. This value should stem from the build system, or set
individually in test cases.

Bug: 307452468
Test: th
Change-Id: I3d536246008acca92cd93e77886e5f7d17a131e0
This commit is contained in:
Daniel Zheng 2024-03-14 14:35:43 -07:00
parent 8c7b66629d
commit 885bd1c8d6
3 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs_mgr/libsnapshot/include/libsnapshot/cow_format.h
View file

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

2
fs_mgr/libsnapshot/libsnapshot_cow/snapshot_reader_test.cpp
View file

@ -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()));
}

2
fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_test.cpp
View file

@ -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() {