diff options
| author | Russ Cox <rsc@swtch.com> | 2007-11-27 15:39:06 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@swtch.com> | 2007-11-27 15:39:06 -0500 |
| commit | 83ab7d88962d717ca5729e7337706b6e4da48af6 (patch) | |
| tree | 2dcaeba8fec383733357f4db5e9c2d0718767838 /src/libdiskfs/ext2.h | |
| parent | 00a8743cd85fcb605a06382387ac526e7fe8bf36 (diff) | |
| parent | 00a8743cd85fcb605a06382387ac526e7fe8bf36 (diff) | |
| download | plan9port-83ab7d88962d717ca5729e7337706b6e4da48af6.tar.gz plan9port-83ab7d88962d717ca5729e7337706b6e4da48af6.tar.bz2 plan9port-83ab7d88962d717ca5729e7337706b6e4da48af6.zip | |
merge
Diffstat (limited to 'src/libdiskfs/ext2.h')
| -rw-r--r-- | src/libdiskfs/ext2.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/libdiskfs/ext2.h b/src/libdiskfs/ext2.h index 159a243b..6109974d 100644 --- a/src/libdiskfs/ext2.h +++ b/src/libdiskfs/ext2.h @@ -51,7 +51,7 @@ enum /* - * Super block on-disk format. + * Super block */ struct Super { @@ -84,7 +84,7 @@ struct Super }; /* - * Block group on-disk format. + * Block group */ struct Group { @@ -94,8 +94,6 @@ struct Group u16int freeblockscount; /* Free blocks count */ u16int freeinodescount; /* Free inodes count */ u16int useddirscount; /* Directories count */ - u16int pad; - u32int reserved[3]; }; enum { @@ -103,7 +101,7 @@ enum }; /* - * Structure of an inode on the disk + * Inode */ struct Inode { @@ -118,13 +116,11 @@ struct Inode u16int nlink; /* Links count */ u32int nblock; /* Blocks count */ u32int flags; /* File flags */ - u32int osd1; u32int block[NBLOCKS];/* Pointers to blocks */ u32int version; /* File version (for NFS) */ u32int fileacl; /* File ACL */ u32int diracl; /* Directory ACL or high size bits */ u32int faddr; /* Fragment address */ - uchar osd2[12]; }; enum { @@ -132,15 +128,14 @@ enum }; /* - * Directory entry on-disk structure. + * Directory entry */ struct Dirent { u32int ino; /* Inode number */ u16int reclen; /* Directory entry length */ u8int namlen; /* Name length */ - u8int pad; - char name[NAMELEN]; /* File name */ + char *name; /* File name */ }; enum { |