add targzToRef mode flag

Signed-off-by: 伏鸾 <[email protected]>
dragonflyoss · Nov 9, 2023 · 77f8df7 · 77f8df7
1 parent 9d42cb1
commit 77f8df7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/builder/src/core/v6.rs b/builder/src/core/v6.rs
@@ -831,6 +831,9 @@ impl Bootstrap {
         if ctx.conversion_type == ConversionType::TarToTarfs {
             ext_sb.set_tarfs_mode();
         }
+        if ctx.conversion_type == ConversionType::TargzToRef {
+            ext_sb.set_targz_ref_mode();
+        }
         bootstrap_ctx
             .writer
             .seek_offset((EROFS_SUPER_OFFSET + EROFS_SUPER_BLOCK_SIZE) as u64)

diff --git a/rafs/src/metadata/direct_v6.rs b/rafs/src/metadata/direct_v6.rs
@@ -83,6 +83,10 @@ impl DirectMappingState {
         self.meta.flags.contains(RafsSuperFlags::TARTFS_MODE)
     }
 
+    fn is_zran(&self) -> bool {
+        self.meta.flags.contains(RafsSuperFlags::TARGZ_REF_MODE)
+    }
+
     fn block_size(&self) -> u64 {
         if self.is_tarfs() {
             EROFS_BLOCK_SIZE_512
@@ -1349,7 +1353,7 @@ impl RafsInodeExt for OndiskInodeWrapper {
                         blob_index, chunk_index
                     ))
                 })
-        } else if state.is_tarfs() || state.meta.has_inlined_chunk_digest() {
+        } else if state.is_tarfs() || state.is_zran() {
             let size = if idx == self.get_chunk_count() - 1 {
                 (self.size() % self.chunk_size() as u64) as u32
             } else {

diff --git a/rafs/src/metadata/layout/v6.rs b/rafs/src/metadata/layout/v6.rs
@@ -559,6 +559,10 @@ impl RafsV6SuperBlockExt {
         self.s_flags |= RafsSuperFlags::TARTFS_MODE.bits();
     }
 
+    pub fn set_targz_ref_mode(&mut self) {
+        self.s_flags |= RafsSuperFlags::TARGZ_REF_MODE.bits();
+    }
+
     /// Set message digest algorithm to handle chunk of the Rafs filesystem.
     pub fn set_digester(&mut self, digester: digest::Algorithm) {
         let c: RafsSuperFlags = digester.into();

diff --git a/rafs/src/metadata/mod.rs b/rafs/src/metadata/mod.rs
@@ -301,6 +301,9 @@ bitflags! {
         const INLINED_CHUNK_DIGEST = 0x0000_0100;
         /// RAFS works in Tarfs mode, which directly uses tar streams as data blobs.
         const TARTFS_MODE = 0x0000_0200;
+
+        const TARGZ_REF_MODE = 0x0000_0400;
+
         /// Data chunks are not encrypted.
         const ENCRYPTION_NONE = 0x0100_0000;
         /// Data chunks are encrypted with AES-128-XTS.