diff --git a/fs_mgr/libsnapshot/libsnapshot_cow/parser_v3.cpp b/fs_mgr/libsnapshot/libsnapshot_cow/parser_v3.cpp index d411ab945..695913a32 100644 --- a/fs_mgr/libsnapshot/libsnapshot_cow/parser_v3.cpp +++ b/fs_mgr/libsnapshot/libsnapshot_cow/parser_v3.cpp @@ -82,7 +82,7 @@ bool CowParserV3::ReadResumeBuffer(borrowed_fd fd) { header_.prefix.header_size + header_.buffer_size); } -std::optional CowParserV3::FindResumeOp(const uint32_t label) { +std::optional CowParserV3::FindResumeOp(const uint64_t label) { for (auto& resume_point : *resume_points_) { if (resume_point.label == label) { return resume_point.op_index; diff --git a/fs_mgr/libsnapshot/libsnapshot_cow/parser_v3.h b/fs_mgr/libsnapshot/libsnapshot_cow/parser_v3.h index dceb815fe..fe3a2fb18 100644 --- a/fs_mgr/libsnapshot/libsnapshot_cow/parser_v3.h +++ b/fs_mgr/libsnapshot/libsnapshot_cow/parser_v3.h @@ -49,7 +49,7 @@ class CowParserV3 final : public CowParserBase { private: bool ParseOps(android::base::borrowed_fd fd, const uint32_t op_index); - std::optional FindResumeOp(const uint32_t label); + std::optional FindResumeOp(const uint64_t label); off_t GetDataOffset() const; CowHeaderV3 header_ = {}; std::shared_ptr> ops_; diff --git a/fs_mgr/libsnapshot/libsnapshot_cow/writer_v3.cpp b/fs_mgr/libsnapshot/libsnapshot_cow/writer_v3.cpp index 89fd903db..7fe7b4157 100644 --- a/fs_mgr/libsnapshot/libsnapshot_cow/writer_v3.cpp +++ b/fs_mgr/libsnapshot/libsnapshot_cow/writer_v3.cpp @@ -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