initfs: Remove uid and gid fields for inodes
The initfs creation code always puts 0 in them.
This commit is contained in:
@@ -329,8 +329,8 @@ impl SchemeSync for InitFsScheme {
|
||||
InodeKind::File(_) => MODE_FILE,
|
||||
_ => 0,
|
||||
};
|
||||
stat.st_uid = inode.uid();
|
||||
stat.st_gid = inode.gid();
|
||||
stat.st_uid = 0;
|
||||
stat.st_gid = 0;
|
||||
stat.st_size = u64::try_from(inode_len(inode)?).unwrap_or(u64::MAX);
|
||||
|
||||
stat.st_ctime = sec.get();
|
||||
|
||||
@@ -147,12 +147,6 @@ impl<'initfs> InodeStruct<'initfs> {
|
||||
pub fn mode(&self) -> u16 {
|
||||
(self.inode.type_and_mode.get() & MODE_MASK) as u16
|
||||
}
|
||||
pub fn uid(&self) -> u32 {
|
||||
self.inode.uid.get()
|
||||
}
|
||||
pub fn gid(&self) -> u32 {
|
||||
self.inode.gid.get()
|
||||
}
|
||||
fn ty(&self) -> Option<InodeType> {
|
||||
let raw = (self.inode.type_and_mode.get() & TYPE_MASK) >> TYPE_SHIFT;
|
||||
|
||||
|
||||
@@ -87,8 +87,6 @@ pub struct InodeHeader {
|
||||
pub type_and_mode: U32,
|
||||
pub length: U32,
|
||||
pub offset: Offset,
|
||||
pub uid: U32,
|
||||
pub gid: U32,
|
||||
}
|
||||
|
||||
pub const MODE_MASK: u32 = 0xFFF;
|
||||
|
||||
@@ -25,7 +25,7 @@ fn main() -> Result<()> {
|
||||
let bytes = std::fs::read(source).context("failed to read image into memory")?;
|
||||
let initfs = InitFs::new(&bytes, None).context("failed to parse initfs header")?;
|
||||
|
||||
dbg!(initfs.header());
|
||||
println!("{:#?}", initfs.header());
|
||||
|
||||
for inode in initfs.all_inodes() {
|
||||
print!("{:?}: ", inode);
|
||||
@@ -38,10 +38,8 @@ fn main() -> Result<()> {
|
||||
}
|
||||
};
|
||||
print!(
|
||||
"mode={:#0o}, uid={}, gid={}, kind=",
|
||||
"mode={:#0o}, kind=",
|
||||
inode_struct.mode(),
|
||||
inode_struct.uid(),
|
||||
inode_struct.gid()
|
||||
);
|
||||
|
||||
use redox_initfs::InodeKind;
|
||||
|
||||
@@ -258,9 +258,6 @@ fn write_inode(
|
||||
type_and_mode: type_and_mode.into(),
|
||||
length: write_result.size.into(),
|
||||
offset: initfs::Offset(write_result.offset.into()),
|
||||
|
||||
gid: 0.into(), //metadata.gid().into(),
|
||||
uid: 0.into(), //metadata.uid().into(),
|
||||
};
|
||||
|
||||
log::debug!(
|
||||
|
||||
Reference in New Issue
Block a user