Use implementation independent inoNN_t scalars for on-disk UFS structures

Approved by:	mdf (mentor)
This commit is contained in:
Gleb Kurtsou 2011-11-09 07:48:48 +00:00
parent 2e4464a4af
commit 58b1333ae5
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=227382
2 changed files with 11 additions and 11 deletions

View file

@ -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];
};

View file

@ -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. */