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

Merge changes I19568d11,I08204e2d into main

Browse source 
* changes:
  libsnapshot: update FindResumeOp type
  libsnapshot: v3 writer GetCowSize
This commit is contained in:
Daniel Zheng 2023-11-14 20:30:19 +00:00 committed by Gerrit Code Review
commit 9270152900
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -82,7 +82,7 @@ bool CowParserV3::ReadResumeBuffer(borrowed_fd fd) {
header_.prefix.header_size + header_.buffer_size);
}
std::optional<uint32_t> CowParserV3::FindResumeOp(const uint32_t label) {
std::optional<uint32_t> CowParserV3::FindResumeOp(const uint64_t label) {
for (auto& resume_point : *resume_points_) {
if (resume_point.label == label) {
return resume_point.op_index;

2
fs_mgr/libsnapshot/libsnapshot_cow/parser_v3.h
View file

@ -49,7 +49,7 @@ class CowParserV3 final : public CowParserBase {
private:
bool ParseOps(android::base::borrowed_fd fd, const uint32_t op_index);
std::optional<uint32_t> FindResumeOp(const uint32_t label);
std::optional<uint32_t> FindResumeOp(const uint64_t label);
off_t GetDataOffset() const;
CowHeaderV3 header_ = {};
std::shared_ptr<std::vector<CowOperationV3>> ops_;

4
fs_mgr/libsnapshot/libsnapshot_cow/writer_v3.cpp
View file

@ -360,9 +360,7 @@ bool CowWriterV3::Finalize() {
}
uint64_t CowWriterV3::GetCowSize() {
LOG(ERROR) << __LINE__ << " " << __FILE__
<< " <- Get Cow Size function here should never be called";
return 0;
return next_data_pos_;
}
} // namespace snapshot