Date: Sun, 12 Jun 2011 18:38:12 +0000 From: gk@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r223157 - in soc2011/gk/ino64-head/sys/ufs: ffs ufs Message-ID: <20110612183812.2B03A106564A@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gk Date: Sun Jun 12 18:38:11 2011 New Revision: 223157 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=223157 Log: ufs: Use uint32_t in on-disk structs Modified: soc2011/gk/ino64-head/sys/ufs/ffs/fs.h soc2011/gk/ino64-head/sys/ufs/ufs/dinode.h soc2011/gk/ino64-head/sys/ufs/ufs/inode.h Modified: soc2011/gk/ino64-head/sys/ufs/ffs/fs.h ============================================================================== --- soc2011/gk/ino64-head/sys/ufs/ffs/fs.h Sun Jun 12 15:46:57 2011 (r223156) +++ soc2011/gk/ino64-head/sys/ufs/ffs/fs.h Sun Jun 12 18:38:11 2011 (r223157) @@ -336,7 +336,7 @@ 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 */ + u_int32_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 */ @@ -692,8 +692,8 @@ */ 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; @@ -706,8 +706,8 @@ */ 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; Modified: soc2011/gk/ino64-head/sys/ufs/ufs/dinode.h ============================================================================== --- soc2011/gk/ino64-head/sys/ufs/ufs/dinode.h Sun Jun 12 15:46:57 2011 (r223156) +++ soc2011/gk/ino64-head/sys/ufs/ufs/dinode.h Sun Jun 12 18:38:11 2011 (r223157) @@ -146,7 +146,7 @@ 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. */ + u_int32_t di_freelink; /* 240: SUJ: Next unlinked inode. */ uint32_t di_spare[3]; /* 244: Reserved; currently unused */ }; @@ -168,7 +168,7 @@ 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. */ + u_int32_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. */ Modified: soc2011/gk/ino64-head/sys/ufs/ufs/inode.h ============================================================================== --- soc2011/gk/ino64-head/sys/ufs/ufs/inode.h Sun Jun 12 15:46:57 2011 (r223156) +++ soc2011/gk/ino64-head/sys/ufs/ufs/inode.h Sun Jun 12 18:38:11 2011 (r223157) @@ -180,7 +180,7 @@ struct ufid { u_int16_t ufid_len; /* Length of structure. */ u_int16_t ufid_pad; /* Force 32-bit alignment. */ - ino_t ufid_ino; /* File number (ino). */ + u_int32_t ufid_ino; /* File number (ino). */ int32_t ufid_gen; /* Generation number. */ }; #endif /* _KERNEL */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110612183812.2B03A106564A>