diff options
| author | gleb <gleb@FreeBSD.org> | 2011-11-09 07:48:48 +0000 |
|---|---|---|
| committer | gleb <gleb@FreeBSD.org> | 2011-11-09 07:48:48 +0000 |
| commit | 1abdbf7023b364ac29b9e36e872c504758f3de08 (patch) | |
| tree | 720e6e2dee630ed8b6ea20cdbe078326e679050c /sys/ufs | |
| parent | 4459c01ca0e0bbd424297477a4fb30a221487460 (diff) | |
| download | FreeBSD-src-1abdbf7023b364ac29b9e36e872c504758f3de08.zip FreeBSD-src-1abdbf7023b364ac29b9e36e872c504758f3de08.tar.gz | |
Use implementation independent inoNN_t scalars for on-disk UFS structures
Approved by: mdf (mentor)
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ffs/fs.h | 18 | ||||
| -rw-r--r-- | sys/ufs/ufs/dinode.h | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h index b1e2174..3715539 100644 --- a/sys/ufs/ffs/fs.h +++ b/sys/ufs/ffs/fs.h @@ -338,7 +338,7 @@ struct fs { ufs2_daddr_t fs_csaddr; /* blk addr of cyl grp summary area */ int64_t fs_pendingblocks; /* (u) blocks being freed */ u_int32_t fs_pendinginodes; /* (u) inodes being freed */ - ino_t fs_snapinum[FSMAXSNAP];/* list of snapshot inode numbers */ + uint32_t fs_snapinum[FSMAXSNAP];/* list of snapshot inode numbers */ u_int32_t fs_avgfilesize; /* expected average file size */ u_int32_t fs_avgfpdir; /* expected # of files per directory */ int32_t fs_save_cgsize; /* save real cg size to use fs_bsize */ @@ -695,11 +695,11 @@ struct jsegrec { */ struct jrefrec { uint32_t jr_op; - ino_t jr_ino; - ino_t jr_parent; + uint32_t jr_ino; + uint32_t jr_parent; uint16_t jr_nlink; uint16_t jr_mode; - off_t jr_diroff; + int64_t jr_diroff; uint64_t jr_unused; }; @@ -709,11 +709,11 @@ struct jrefrec { */ struct jmvrec { uint32_t jm_op; - ino_t jm_ino; - ino_t jm_parent; + uint32_t jm_ino; + uint32_t jm_parent; uint16_t jm_unused; - off_t jm_oldoff; - off_t jm_newoff; + int64_t jm_oldoff; + int64_t jm_newoff; }; /* @@ -737,7 +737,7 @@ struct jblkrec { struct jtrncrec { uint32_t jt_op; uint32_t jt_ino; - off_t jt_size; + int64_t jt_size; uint32_t jt_extsize; uint32_t jt_pad[3]; }; diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h index c75257c..8aa1fe0 100644 --- a/sys/ufs/ufs/dinode.h +++ b/sys/ufs/ufs/dinode.h @@ -146,7 +146,7 @@ struct ufs2_dinode { ufs2_daddr_t di_db[NDADDR]; /* 112: Direct disk blocks. */ ufs2_daddr_t di_ib[NIADDR]; /* 208: Indirect disk blocks. */ u_int64_t di_modrev; /* 232: i_modrev for NFSv4 */ - ino_t di_freelink; /* 240: SUJ: Next unlinked inode. */ + uint32_t di_freelink; /* 240: SUJ: Next unlinked inode. */ uint32_t di_spare[3]; /* 244: Reserved; currently unused */ }; @@ -168,7 +168,7 @@ struct ufs2_dinode { struct ufs1_dinode { u_int16_t di_mode; /* 0: IFMT, permissions; see below. */ int16_t di_nlink; /* 2: File link count. */ - ino_t di_freelink; /* 4: SUJ: Next unlinked inode. */ + uint32_t di_freelink; /* 4: SUJ: Next unlinked inode. */ u_int64_t di_size; /* 8: File byte count. */ int32_t di_atime; /* 16: Last access time. */ int32_t di_atimensec; /* 20: Last access time. */ |
