commit bb45742ba141ad149c3960854ff32074390a9f5a
author Daniel Zheng <zhengdaniel@google.com> Tue Oct 10 13:19:56 2023 -0700
committer Daniel Zheng <zhengdaniel@google.com> Tue Oct 10 15:06:26 2023 -0700
tree f2b31fc5628530d3fcee3785ce8208b1f99ae68e
parent ed1a7d5fafd98049777c2c26349984ae31563a86

Move Cow Header child writer

v2 writer and v3 writer will write different versions of the header.
It's better to have each writer hold it's own header.

Test: th
Change-Id: Ibe310d58b830950ad556aabcd0c1009483fc8d86

fs_mgr/libsnapshot/libsnapshot_cow/writer_base.h

diff --git a/fs_mgr/libsnapshot/libsnapshot_cow/writer_base.h b/fs_mgr/libsnapshot/libsnapshot_cow/writer_base.h
index cdf6222..709b248 100644
--- a/fs_mgr/libsnapshot/libsnapshot_cow/writer_base.h
+++ b/fs_mgr/libsnapshot/libsnapshot_cow/writer_base.h
@@ -63,7 +63,6 @@
     bool ValidateNewBlock(uint64_t new_block);
 
     CowOptions options_;
-    CowHeader header_{};
 
     android::base::unique_fd fd_;
     bool is_dev_null_ = false;

fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.h

diff --git a/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.h b/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.h
index ce97b01..24170eb 100644
--- a/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.h
+++ b/fs_mgr/libsnapshot/libsnapshot_cow/writer_v2.h
@@ -63,6 +63,7 @@
 
   private:
     CowFooter footer_{};
+    CowHeader header_{};
     CowCompression compression_;
     // in the case that we are using one thread for compression, we can store and re-use the same
     // compressor