diff --git a/initfs/src/lib.rs b/initfs/src/lib.rs index befb50ec3f..16e3bc3d23 100644 --- a/initfs/src/lib.rs +++ b/initfs/src/lib.rs @@ -141,8 +141,7 @@ impl<'initfs> InodeStruct<'initfs> { } fn data(&self) -> Result<&'initfs [u8]> { let start: usize = self.inode.offset.0.get().try_into().map_err(|_| Error)?; - - let length: usize = self.inode.length.get().try_into().map_err(|_| Error)?; + let length: usize = self.inode.length.0.get().try_into().map_err(|_| Error)?; let end = start.checked_add(length).ok_or(Error)?; diff --git a/initfs/src/types.rs b/initfs/src/types.rs index 68cf46fe66..8ef4a87833 100644 --- a/initfs/src/types.rs +++ b/initfs/src/types.rs @@ -81,7 +81,7 @@ const _: () = { #[derive(Clone, Copy, Debug)] pub struct InodeHeader { pub type_: U32, - pub length: U32, + pub length: Length, pub offset: Offset, } diff --git a/initfs/tools/src/lib.rs b/initfs/tools/src/lib.rs index b8e56971e5..00d9791168 100644 --- a/initfs/tools/src/lib.rs +++ b/initfs/tools/src/lib.rs @@ -253,7 +253,7 @@ fn write_inode( *inode_hdr = initfs::InodeHeader { type_: (ty as u32).into(), - length: write_result.size.into(), + length: initfs::Length(write_result.size.into()), offset: initfs::Offset(write_result.offset.into()), };