Author: gleb
Date: Wed Nov 9 07:48:48 2011
New Revision: 227382
URL: http://svn.freebsd.org/changeset/base/227382
Log:
Use implementation independent inoNN_t scalars for on-disk UFS structures
Approved by: mdf (mentor)
Modified:
head/sys/ufs/ffs/fs.h
head/sys/ufs/ufs/dinode.h
Modified: head/sys/ufs/ffs/fs.h
==============================================================================
--- head/sys/ufs/ffs/fs.h Wed Nov 9 05:48:20 2011 (r227381)
+++ head/sys/ufs/ffs/fs.h Wed Nov 9 07:48:48 2011 (r227382)
@@ -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];
};
Modified: head/sys/ufs/ufs/dinode.h
==============================================================================
--- head/sys/ufs/ufs/dinode.h Wed Nov 9 05:48:20 2011 (r227381)
+++ head/sys/ufs/ufs/dinode.h Wed Nov 9 07:48:48 2011 (r227382)
@@ -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. */
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
