commit 20bf593327c854cca76b4b2890171e0570434460
author Nico Huber <nico.huber@secunet.com> Mon Feb 05 12:02:54 2024 +0100
committer Nico Huber <nico.huber@secunet.com> Mon Feb 05 12:02:54 2024 +0100
tree 45a87bc42a8ffb163582f3ec1d9a374dab28b986
parent 7e7d149e92b65080ff9976715cb5ecbbb8897dbb

ext2: Rename Inode_Extents -> Inline_Extents

src/filo-fs-ext2.adb

diff --git a/src/filo-fs-ext2.adb b/src/filo-fs-ext2.adb
index 3a7b6ac..bab0c69 100644
--- a/src/filo-fs-ext2.adb
+++ b/src/filo-fs-ext2.adb
@@ -205,10 +205,10 @@
          Triple_Indirect   : Unsigned_32;
       end record
       with
-         Size => Inode_Extents'Length * 8,
-         Object_Size => Inode_Extents'Length * 8;
+         Size => Inline_Extents'Length * 8,
+         Object_Size => Inline_Extents'Length * 8;
 
-      function I_Blocks is new Ada.Unchecked_Conversion (Inode_Extents, Inode_Blocks);
+      function I_Blocks is new Ada.Unchecked_Conversion (Inline_Extents, Inode_Blocks);
       function I_Blocks (State : T) return Inode_Blocks is (I_Blocks (State.Inode.Inline));
 
       Addr_Per_Block : constant FSBlock_Logical := FSBlock_Logical (Static.Block_Size / 4);
@@ -509,7 +509,7 @@
          end;
       end Next_Ref;
 
-      Inline_Extents : Ext2.Inode_Extents renames State.Inode.Inline;
+      Inline_Extents : Ext2.Inline_Extents renames State.Inode.Inline;
       Inode_Magic : constant Unsigned_16 := Header_Magic (Inline_Extents);
       Inode_Entries : constant Natural := Header_Entries (Inline_Extents);
       First_Logical : constant FSBlock_Logical := Extent_Logical (Inline_Extents, 1);

src/filo-fs-ext2.ads

diff --git a/src/filo-fs-ext2.ads b/src/filo-fs-ext2.ads
index 31a679e..1da3d77 100644
--- a/src/filo-fs-ext2.ads
+++ b/src/filo-fs-ext2.ads
@@ -67,10 +67,10 @@
    subtype Cache_Buffer is Buffer_Type (Max_Block_Index);
 
    -- Same as the 12 direct + 3 indirect blocks times 4B:
-   subtype Inode_Extents_Index is Natural range 0 .. 59;
-   subtype Inode_Extents is Buffer_Type (Inode_Extents_Index)
+   subtype Inline_Extents_Index is Natural range 0 .. 59;
+   subtype Inline_Extents is Buffer_Type (Inline_Extents_Index)
    with
-      Object_Size => (Inode_Extents_Index'Last + 1) * 8;
+      Object_Size => (Inline_Extents_Index'Last + 1) * 8;
 
    -- TODO: Could use modular Unsigned_32 if GNATprove wouldn't stumble as much:
    type Inode_0_Index is new Integer_64 range 0 .. Integer_64 (Unsigned_32'Last);
@@ -91,7 +91,7 @@
       Mode        : Inode_Type := Inode_Type'First;
       Size        : Inode_Length := 0;
       Use_Extents : Boolean := False;
-      Inline      : Inode_Extents := (others => 16#00#);
+      Inline      : Inline_Extents := (others => 16#00#);
       Map_Cache   : Inode_Map_Cache := (others => <>);
    end record;