Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/ufs/lfs Massedit u_int{8, 16, 32, 64}_t to uint{8, 16, 32, 64}...
details: https://anonhg.NetBSD.org/src/rev/ac1ef2b48399
branches: trunk
changeset: 816165:ac1ef2b48399
user: dholland <dholland%NetBSD.org@localhost>
date: Mon Jun 20 03:25:46 2016 +0000
description:
Massedit u_int{8,16,32,64}_t to uint{8,16,32,64}_t. This effectively
merges ufs/dinode.h 1.25.
diffstat:
sys/ufs/lfs/lfs.h | 440 ++++++++++++++++++++++----------------------
sys/ufs/lfs/lfs_accessors.h | 108 +++++-----
sys/ufs/lfs/ulfs_dinode.h | 4 +-
3 files changed, 276 insertions(+), 276 deletions(-)
diffs (truncated from 907 to 300 lines):
diff -r 4168f46a1717 -r ac1ef2b48399 sys/ufs/lfs/lfs.h
--- a/sys/ufs/lfs/lfs.h Mon Jun 20 03:11:21 2016 +0000
+++ b/sys/ufs/lfs/lfs.h Mon Jun 20 03:25:46 2016 +0000
@@ -1,6 +1,6 @@
-/* $NetBSD: lfs.h,v 1.198 2016/06/19 22:38:23 dholland Exp $ */
+/* $NetBSD: lfs.h,v 1.199 2016/06/20 03:25:46 dholland Exp $ */
-/* from NetBSD: dinode.h,v 1.24 2013/06/09 17:55:46 dholland Exp */
+/* from NetBSD: dinode.h,v 1.25 2016/01/22 23:06:10 dholland Exp */
/* from NetBSD: dir.h,v 1.25 2015/09/01 06:16:03 dholland Exp */
/*-
@@ -350,18 +350,18 @@
*/
struct lfs_dirheader32 {
- u_int32_t dh_ino; /* inode number of entry */
- u_int16_t dh_reclen; /* length of this record */
- u_int8_t dh_type; /* file type, see below */
- u_int8_t dh_namlen; /* length of string in d_name */
+ uint32_t dh_ino; /* inode number of entry */
+ uint16_t dh_reclen; /* length of this record */
+ uint8_t dh_type; /* file type, see below */
+ uint8_t dh_namlen; /* length of string in d_name */
};
struct lfs_dirheader64 {
- u_int32_t dh_inoA; /* inode number of entry */
- u_int32_t dh_inoB; /* inode number of entry */
- u_int16_t dh_reclen; /* length of this record */
- u_int8_t dh_type; /* file type, see below */
- u_int8_t dh_namlen; /* length of string in d_name */
+ uint32_t dh_inoA; /* inode number of entry */
+ uint32_t dh_inoB; /* inode number of entry */
+ uint16_t dh_reclen; /* length of this record */
+ uint8_t dh_type; /* file type, see below */
+ uint8_t dh_namlen; /* length of string in d_name */
};
union lfs_dirheader {
@@ -399,13 +399,13 @@
* This is the old format of directories, sans type element.
*/
struct lfs_odirtemplate {
- u_int32_t dot_ino;
+ uint32_t dot_ino;
int16_t dot_reclen;
- u_int16_t dot_namlen;
+ uint16_t dot_namlen;
char dot_name[4]; /* must be multiple of 4 */
- u_int32_t dotdot_ino;
+ uint32_t dotdot_ino;
int16_t dotdot_reclen;
- u_int16_t dotdot_namlen;
+ uint16_t dotdot_namlen;
char dotdot_name[4]; /* ditto */
};
#endif
@@ -422,10 +422,10 @@
*/
struct lfs32_dinode {
- u_int16_t di_mode; /* 0: IFMT, permissions; see below. */
+ uint16_t di_mode; /* 0: IFMT, permissions; see below. */
int16_t di_nlink; /* 2: File link count. */
- u_int32_t di_inumber; /* 4: Inode number. */
- u_int64_t di_size; /* 8: File byte count. */
+ uint32_t di_inumber; /* 4: Inode number. */
+ uint64_t di_size; /* 8: File byte count. */
int32_t di_atime; /* 16: Last access time. */
int32_t di_atimensec; /* 20: Last access time. */
int32_t di_mtime; /* 24: Last modified time. */
@@ -434,22 +434,22 @@
int32_t di_ctimensec; /* 36: Last inode change time. */
int32_t di_db[ULFS_NDADDR]; /* 40: Direct disk blocks. */
int32_t di_ib[ULFS_NIADDR]; /* 88: Indirect disk blocks. */
- u_int32_t di_flags; /* 100: Status flags (chflags). */
- u_int32_t di_blocks; /* 104: Blocks actually held. */
+ uint32_t di_flags; /* 100: Status flags (chflags). */
+ uint32_t di_blocks; /* 104: Blocks actually held. */
int32_t di_gen; /* 108: Generation number. */
- u_int32_t di_uid; /* 112: File owner. */
- u_int32_t di_gid; /* 116: File group. */
- u_int64_t di_modrev; /* 120: i_modrev for NFSv4 */
+ uint32_t di_uid; /* 112: File owner. */
+ uint32_t di_gid; /* 116: File group. */
+ uint64_t di_modrev; /* 120: i_modrev for NFSv4 */
};
struct lfs64_dinode {
- u_int16_t di_mode; /* 0: IFMT, permissions; see below. */
+ uint16_t di_mode; /* 0: IFMT, permissions; see below. */
int16_t di_nlink; /* 2: File link count. */
- u_int32_t di_uid; /* 4: File owner. */
- u_int32_t di_gid; /* 8: File group. */
- u_int32_t di_blksize; /* 12: Inode blocksize. */
- u_int64_t di_size; /* 16: File byte count. */
- u_int64_t di_blocks; /* 24: Bytes actually held. */
+ uint32_t di_uid; /* 4: File owner. */
+ uint32_t di_gid; /* 8: File group. */
+ uint32_t di_blksize; /* 12: Inode blocksize. */
+ uint64_t di_size; /* 16: File byte count. */
+ uint64_t di_blocks; /* 24: Bytes actually held. */
int64_t di_atime; /* 32: Last access time. */
int64_t di_mtime; /* 40: Last modified time. */
int64_t di_ctime; /* 48: Last inode change time. */
@@ -459,15 +459,15 @@
int32_t di_ctimensec; /* 72: Last inode change time. */
int32_t di_birthnsec; /* 76: Inode creation time. */
int32_t di_gen; /* 80: Generation number. */
- u_int32_t di_kernflags; /* 84: Kernel flags. */
- u_int32_t di_flags; /* 88: Status flags (chflags). */
+ uint32_t di_kernflags; /* 84: Kernel flags. */
+ uint32_t di_flags; /* 88: Status flags (chflags). */
int32_t di_extsize; /* 92: External attributes block. */
int64_t di_extb[ULFS_NXADDR];/* 96: External attributes block. */
int64_t di_db[ULFS_NDADDR]; /* 112: Direct disk blocks. */
int64_t di_ib[ULFS_NIADDR]; /* 208: Indirect disk blocks. */
- u_int64_t di_modrev; /* 232: i_modrev for NFSv4 */
- u_int64_t di_inumber; /* 240: Inode number */
- u_int64_t di_spare[1]; /* 244: Reserved; currently unused */
+ uint64_t di_modrev; /* 232: i_modrev for NFSv4 */
+ uint64_t di_inumber; /* 240: Inode number */
+ uint64_t di_spare[1]; /* 244: Reserved; currently unused */
};
union lfs_dinode {
@@ -522,10 +522,10 @@
*/
typedef struct segusage SEGUSE;
struct segusage {
- u_int32_t su_nbytes; /* 0: number of live bytes */
- u_int32_t su_olastmod; /* 4: SEGUSE last modified timestamp */
- u_int16_t su_nsums; /* 8: number of summaries in segment */
- u_int16_t su_ninos; /* 10: number of inode blocks in seg */
+ uint32_t su_nbytes; /* 0: number of live bytes */
+ uint32_t su_olastmod; /* 4: SEGUSE last modified timestamp */
+ uint16_t su_nsums; /* 8: number of summaries in segment */
+ uint16_t su_ninos; /* 10: number of inode blocks in seg */
#define SEGUSE_ACTIVE 0x01 /* segment currently being written */
#define SEGUSE_DIRTY 0x02 /* segment has data in it */
@@ -533,17 +533,17 @@
#define SEGUSE_ERROR 0x08 /* cleaner: do not clean segment */
#define SEGUSE_EMPTY 0x10 /* segment is empty */
#define SEGUSE_INVAL 0x20 /* segment is invalid */
- u_int32_t su_flags; /* 12: segment flags */
- u_int64_t su_lastmod; /* 16: last modified timestamp */
+ uint32_t su_flags; /* 12: segment flags */
+ uint64_t su_lastmod; /* 16: last modified timestamp */
};
typedef struct segusage_v1 SEGUSE_V1;
struct segusage_v1 {
- u_int32_t su_nbytes; /* 0: number of live bytes */
- u_int32_t su_lastmod; /* 4: SEGUSE last modified timestamp */
- u_int16_t su_nsums; /* 8: number of summaries in segment */
- u_int16_t su_ninos; /* 10: number of inode blocks in seg */
- u_int32_t su_flags; /* 12: segment flags */
+ uint32_t su_nbytes; /* 0: number of live bytes */
+ uint32_t su_lastmod; /* 4: SEGUSE last modified timestamp */
+ uint16_t su_nsums; /* 8: number of summaries in segment */
+ uint16_t su_ninos; /* 10: number of inode blocks in seg */
+ uint32_t su_flags; /* 12: segment flags */
};
/*
@@ -556,19 +556,19 @@
typedef struct finfo64 FINFO64;
struct finfo64 {
- u_int32_t fi_nblocks; /* number of blocks */
- u_int32_t fi_version; /* version number */
- u_int64_t fi_ino; /* inode number */
- u_int32_t fi_lastlength; /* length of last block in array */
- u_int32_t fi_pad; /* unused */
+ uint32_t fi_nblocks; /* number of blocks */
+ uint32_t fi_version; /* version number */
+ uint64_t fi_ino; /* inode number */
+ uint32_t fi_lastlength; /* length of last block in array */
+ uint32_t fi_pad; /* unused */
};
typedef struct finfo32 FINFO32;
struct finfo32 {
- u_int32_t fi_nblocks; /* number of blocks */
- u_int32_t fi_version; /* version number */
- u_int32_t fi_ino; /* inode number */
- u_int32_t fi_lastlength; /* length of last block in array */
+ uint32_t fi_nblocks; /* number of blocks */
+ uint32_t fi_version; /* version number */
+ uint32_t fi_ino; /* inode number */
+ uint32_t fi_lastlength; /* length of last block in array */
};
typedef union finfo {
@@ -604,31 +604,31 @@
/* magic value for daddrs */
#define LFS_UNUSED_DADDR 0 /* out-of-band daddr */
/* magic value for if_nextfree */
-#define LFS_ORPHAN_NEXTFREE (~(u_int32_t)0) /* indicate orphaned file */
+#define LFS_ORPHAN_NEXTFREE (~(uint32_t)0) /* indicate orphaned file */
typedef struct ifile64 IFILE64;
struct ifile64 {
- u_int32_t if_version; /* inode version number */
- u_int32_t if_atime_nsec; /* and nanoseconds */
- u_int64_t if_atime_sec; /* Last access time, seconds */
+ uint32_t if_version; /* inode version number */
+ uint32_t if_atime_nsec; /* and nanoseconds */
+ uint64_t if_atime_sec; /* Last access time, seconds */
int64_t if_daddr; /* inode disk address */
- u_int64_t if_nextfree; /* next-unallocated inode */
+ uint64_t if_nextfree; /* next-unallocated inode */
};
typedef struct ifile32 IFILE32;
struct ifile32 {
- u_int32_t if_version; /* inode version number */
+ uint32_t if_version; /* inode version number */
int32_t if_daddr; /* inode disk address */
- u_int32_t if_nextfree; /* next-unallocated inode */
- u_int32_t if_atime_sec; /* Last access time, seconds */
- u_int32_t if_atime_nsec; /* and nanoseconds */
+ uint32_t if_nextfree; /* next-unallocated inode */
+ uint32_t if_atime_sec; /* Last access time, seconds */
+ uint32_t if_atime_nsec; /* and nanoseconds */
};
typedef struct ifile_v1 IFILE_V1;
struct ifile_v1 {
- u_int32_t if_version; /* inode version number */
+ uint32_t if_version; /* inode version number */
int32_t if_daddr; /* inode disk address */
- u_int32_t if_nextfree; /* next-unallocated inode */
+ uint32_t if_nextfree; /* next-unallocated inode */
#if LFS_ATIME_IFILE
#error "this cannot work"
struct timespec if_atime; /* Last access time */
@@ -655,24 +655,24 @@
#define LFS_CLEANER_MUST_CLEAN 0x01
typedef struct _cleanerinfo32 {
- u_int32_t clean; /* 0: number of clean segments */
- u_int32_t dirty; /* 4: number of dirty segments */
+ uint32_t clean; /* 0: number of clean segments */
+ uint32_t dirty; /* 4: number of dirty segments */
int32_t bfree; /* 8: disk blocks free */
int32_t avail; /* 12: disk blocks available */
- u_int32_t free_head; /* 16: head of the inode free list */
- u_int32_t free_tail; /* 20: tail of the inode free list */
- u_int32_t flags; /* 24: status word from the kernel */
+ uint32_t free_head; /* 16: head of the inode free list */
+ uint32_t free_tail; /* 20: tail of the inode free list */
+ uint32_t flags; /* 24: status word from the kernel */
} CLEANERINFO32;
typedef struct _cleanerinfo64 {
- u_int32_t clean; /* 0: number of clean segments */
- u_int32_t dirty; /* 4: number of dirty segments */
+ uint32_t clean; /* 0: number of clean segments */
+ uint32_t dirty; /* 4: number of dirty segments */
int64_t bfree; /* 8: disk blocks free */
int64_t avail; /* 16: disk blocks available */
- u_int64_t free_head; /* 24: head of the inode free list */
- u_int64_t free_tail; /* 32: tail of the inode free list */
- u_int32_t flags; /* 40: status word from the kernel */
- u_int32_t pad; /* 44: must be 64-bit aligned */
+ uint64_t free_head; /* 24: head of the inode free list */
+ uint64_t free_tail; /* 32: tail of the inode free list */
+ uint32_t flags; /* 40: status word from the kernel */
+ uint32_t pad; /* 44: must be 64-bit aligned */
} CLEANERINFO64;
/* this must not go to disk directly of course */
@@ -700,49 +700,49 @@
typedef struct segsum_v1 SEGSUM_V1;
struct segsum_v1 {
- u_int32_t ss_sumsum; /* 0: check sum of summary block */
- u_int32_t ss_datasum; /* 4: check sum of data */
- u_int32_t ss_magic; /* 8: segment summary magic number */
+ uint32_t ss_sumsum; /* 0: check sum of summary block */
+ uint32_t ss_datasum; /* 4: check sum of data */
+ uint32_t ss_magic; /* 8: segment summary magic number */
int32_t ss_next; /* 12: next segment */
- u_int32_t ss_create; /* 16: creation time stamp */
- u_int16_t ss_nfinfo; /* 20: number of file info structures */
- u_int16_t ss_ninos; /* 22: number of inodes in summary */
- u_int16_t ss_flags; /* 24: used for directory operations */
- u_int16_t ss_pad; /* 26: extra space */
+ uint32_t ss_create; /* 16: creation time stamp */
+ uint16_t ss_nfinfo; /* 20: number of file info structures */
+ uint16_t ss_ninos; /* 22: number of inodes in summary */
+ uint16_t ss_flags; /* 24: used for directory operations */
+ uint16_t ss_pad; /* 26: extra space */
/* FINFO's and inode daddr's... */
};
typedef struct segsum32 SEGSUM32;
- Prev by Date:
[src/trunk]: src/sys/ufs/lfs Merge ufs_inode.c 1.93: missing unlock on error ...
- Next by Date:
[src/trunk]: src/sys/ufs/lfs u_int{8, 16, 32, 64}_t -> uint{8, 16, 32, 64}_t in rem...
- Previous by Thread:
[src/trunk]: src/sys/ufs/lfs Merge ufs_inode.c 1.93: missing unlock on error ...
- Next by Thread:
[src/trunk]: src/sys/ufs/lfs u_int{8, 16, 32, 64}_t -> uint{8, 16, 32, 64}_t in rem...
- Indexes:
Home |
Main Index |
Thread Index |
Old Index