Module Name: src
Committed By: dholland
Date: Mon Jun 20 03:29:52 UTC 2016
Modified Files:
src/sys/ufs/lfs: lfs_extern.h lfs_inode.h lfs_kernel.h ulfs_bswap.h
ulfs_dirhash.h ulfs_inode.h ulfs_quota.h ulfs_quota1.h
Log Message:
u_int{8,16,32,64}_t -> uint{8,16,32,64}_t in remaining lfs headers.
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/sys/ufs/lfs/lfs_extern.h
cvs rdiff -u -r1.15 -r1.16 src/sys/ufs/lfs/lfs_inode.h
cvs rdiff -u -r1.2 -r1.3 src/sys/ufs/lfs/lfs_kernel.h
cvs rdiff -u -r1.7 -r1.8 src/sys/ufs/lfs/ulfs_bswap.h
cvs rdiff -u -r1.9 -r1.10 src/sys/ufs/lfs/ulfs_dirhash.h
cvs rdiff -u -r1.20 -r1.21 src/sys/ufs/lfs/ulfs_inode.h
cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/lfs/ulfs_quota.h
cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/lfs/ulfs_quota1.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/lfs/lfs_extern.h
diff -u src/sys/ufs/lfs/lfs_extern.h:1.110 src/sys/ufs/lfs/lfs_extern.h:1.111
--- src/sys/ufs/lfs/lfs_extern.h:1.110 Wed Aug 12 18:28:01 2015
+++ src/sys/ufs/lfs/lfs_extern.h Mon Jun 20 03:29:52 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_extern.h,v 1.110 2015/08/12 18:28:01 dholland Exp $ */
+/* $NetBSD: lfs_extern.h,v 1.111 2016/06/20 03:29:52 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -271,10 +271,10 @@ extern const struct genfs_ops lfs_genfso
#endif /* defined(_KERNEL) */
/* lfs_cksum.c */
-u_int32_t cksum(void *, size_t);
-u_int32_t lfs_cksum_part(void *, size_t, u_int32_t);
+uint32_t cksum(void *, size_t);
+uint32_t lfs_cksum_part(void *, size_t, uint32_t);
#define lfs_cksum_fold(sum) (sum)
-u_int32_t lfs_sb_cksum(struct lfs *);
+uint32_t lfs_sb_cksum(struct lfs *);
__END_DECLS
Index: src/sys/ufs/lfs/lfs_inode.h
diff -u src/sys/ufs/lfs/lfs_inode.h:1.15 src/sys/ufs/lfs/lfs_inode.h:1.16
--- src/sys/ufs/lfs/lfs_inode.h:1.15 Mon Jun 20 02:25:03 2016
+++ src/sys/ufs/lfs/lfs_inode.h Mon Jun 20 03:29:52 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_inode.h,v 1.15 2016/06/20 02:25:03 dholland Exp $ */
+/* $NetBSD: lfs_inode.h,v 1.16 2016/06/20 03:29:52 dholland Exp $ */
/* from NetBSD: ulfs_inode.h,v 1.5 2013/06/06 00:51:50 dholland Exp */
/* from NetBSD: inode.h,v 1.72 2016/06/03 15:36:03 christos Exp */
@@ -81,7 +81,7 @@ struct ulfs_lookup_results {
doff_t ulr_endoff; /* End of useful stuff in directory. */
doff_t ulr_diroff; /* Offset in dir, where we found last entry. */
doff_t ulr_offset; /* Offset of free space in directory. */
- u_int32_t ulr_reclen; /* Size of found directory entry. */
+ uint32_t ulr_reclen; /* Size of found directory entry. */
};
/* notyet XXX */
@@ -107,7 +107,7 @@ struct inode {
struct vnode *i_vnode; /* Vnode associated with this inode. */
struct ulfsmount *i_ump; /* Mount point associated with this inode. */
struct vnode *i_devvp; /* Vnode for block I/O. */
- u_int32_t i_flag; /* flags, see below */
+ uint32_t i_flag; /* flags, see below */
dev_t i_dev; /* Device associated with the inode. */
ino_t i_number; /* The identity of the inode. */
@@ -137,14 +137,14 @@ struct inode {
*
* These fields are currently only used by LFS.
*/
- u_int16_t i_mode; /* IFMT, permissions; see below. */
+ uint16_t i_mode; /* IFMT, permissions; see below. */
int16_t i_nlink; /* File link count. */
- u_int64_t i_size; /* File byte count. */
- u_int32_t i_flags; /* Status flags (chflags). */
+ uint64_t i_size; /* File byte count. */
+ uint32_t i_flags; /* Status flags (chflags). */
int32_t i_gen; /* Generation number. */
- u_int32_t i_uid; /* File owner. */
- u_int32_t i_gid; /* File group. */
- u_int16_t i_omode; /* Old mode, for ulfs_reclaim. */
+ uint32_t i_uid; /* File owner. */
+ uint32_t i_gid; /* File group. */
+ uint16_t i_omode; /* Old mode, for ulfs_reclaim. */
struct dirhash *i_dirhash; /* Hashing for large directories */
@@ -175,7 +175,7 @@ struct inode {
*/
struct lfs_inode_ext {
off_t lfs_osize; /* size of file on disk */
- u_int64_t lfs_effnblocks; /* number of blocks when i/o completes */
+ uint64_t lfs_effnblocks; /* number of blocks when i/o completes */
size_t lfs_fragsize[ULFS_NDADDR]; /* size of on-disk direct blocks */
TAILQ_ENTRY(inode) lfs_dchain; /* Dirop chain. */
TAILQ_ENTRY(inode) lfs_pchain; /* Paging chain. */
@@ -184,7 +184,7 @@ struct lfs_inode_ext {
#define LFSI_WRAPBLOCK 0x04
#define LFSI_WRAPWAIT 0x08
#define LFSI_BMAP 0x10
- u_int32_t lfs_iflags; /* Inode flags */
+ uint32_t lfs_iflags; /* Inode flags */
daddr_t lfs_hiblk; /* Highest lbn held by inode */
#ifdef _KERNEL
SPLAY_HEAD(lfs_splay, lbnentry) lfs_lbtree; /* Tree of balloc'd lbns */
Index: src/sys/ufs/lfs/lfs_kernel.h
diff -u src/sys/ufs/lfs/lfs_kernel.h:1.2 src/sys/ufs/lfs/lfs_kernel.h:1.3
--- src/sys/ufs/lfs/lfs_kernel.h:1.2 Wed Aug 12 18:24:14 2015
+++ src/sys/ufs/lfs/lfs_kernel.h Mon Jun 20 03:29:52 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_kernel.h,v 1.2 2015/08/12 18:24:14 dholland Exp $ */
+/* $NetBSD: lfs_kernel.h,v 1.3 2016/06/20 03:29:52 dholland Exp $ */
/* from NetBSD: lfs.h,v 1.157 2013/06/28 16:14:06 matt Exp */
@@ -81,7 +81,7 @@ struct lfs_cluster {
#define LFS_CL_MALLOC 0x00000001
#define LFS_CL_SHIFT 0x00000002
#define LFS_CL_SYNC 0x00000004
- u_int32_t flags; /* Flags */
+ uint32_t flags; /* Flags */
struct lfs *fs; /* LFS that this belongs to */
struct segment *seg; /* Segment structure, for LFS_CL_SYNC */
};
Index: src/sys/ufs/lfs/ulfs_bswap.h
diff -u src/sys/ufs/lfs/ulfs_bswap.h:1.7 src/sys/ufs/lfs/ulfs_bswap.h:1.8
--- src/sys/ufs/lfs/ulfs_bswap.h:1.7 Sun Jun 19 22:46:19 2016
+++ src/sys/ufs/lfs/ulfs_bswap.h Mon Jun 20 03:29:52 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_bswap.h,v 1.7 2016/06/19 22:46:19 dholland Exp $ */
+/* $NetBSD: ulfs_bswap.h,v 1.8 2016/06/20 03:29:52 dholland Exp $ */
/* from NetBSD: ufs_bswap.h,v 1.21 2016/04/29 03:05:04 christos Exp */
/*
@@ -48,19 +48,19 @@
#if !defined(_KERNEL) || defined(LFS_EI)
/* inlines for access to swapped data */
-static inline u_int16_t
+static inline uint16_t
ulfs_rw16(uint16_t a, int ns)
{
return ((ns) ? bswap16(a) : (a));
}
-static inline u_int32_t
+static inline uint32_t
ulfs_rw32(uint32_t a, int ns)
{
return ((ns) ? bswap32(a) : (a));
}
-static inline u_int64_t
+static inline uint64_t
ulfs_rw64(uint64_t a, int ns)
{
return ((ns) ? bswap64(a) : (a));
Index: src/sys/ufs/lfs/ulfs_dirhash.h
diff -u src/sys/ufs/lfs/ulfs_dirhash.h:1.9 src/sys/ufs/lfs/ulfs_dirhash.h:1.10
--- src/sys/ufs/lfs/ulfs_dirhash.h:1.9 Sun Jun 19 23:06:09 2016
+++ src/sys/ufs/lfs/ulfs_dirhash.h Mon Jun 20 03:29:52 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_dirhash.h,v 1.9 2016/06/19 23:06:09 dholland Exp $ */
+/* $NetBSD: ulfs_dirhash.h,v 1.10 2016/06/20 03:29:52 dholland Exp $ */
/* from NetBSD: dirhash.h,v 1.7 2013/06/09 17:57:09 dholland Exp */
/*
@@ -91,7 +91,7 @@ struct dirhash {
int dh_hlen; /* total slots in the 2-level hash array */
int dh_hused; /* entries in use */
- u_int8_t *dh_blkfree; /* free DIRALIGN words in each dir block */
+ uint8_t *dh_blkfree; /* free DIRALIGN words in each dir block */
size_t dh_blkfreesz;
int dh_nblk; /* size of dh_blkfree array */
int dh_dirblks; /* number of DIRBLKSIZ blocks in dir */
Index: src/sys/ufs/lfs/ulfs_inode.h
diff -u src/sys/ufs/lfs/ulfs_inode.h:1.20 src/sys/ufs/lfs/ulfs_inode.h:1.21
--- src/sys/ufs/lfs/ulfs_inode.h:1.20 Mon Jun 20 02:25:03 2016
+++ src/sys/ufs/lfs/ulfs_inode.h Mon Jun 20 03:29:52 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_inode.h,v 1.20 2016/06/20 02:25:03 dholland Exp $ */
+/* $NetBSD: ulfs_inode.h,v 1.21 2016/06/20 03:29:52 dholland Exp $ */
/* from NetBSD: inode.h,v 1.72 2016/06/03 15:36:03 christos Exp */
/*
@@ -144,10 +144,10 @@ typedef struct lfs_res_blk {
#ifdef _KERNEL
/* This overlays the fid structure (see fstypes.h). */
struct ulfs_ufid {
- u_int16_t ufid_len; /* Length of structure. */
- u_int16_t ufid_pad; /* Force 32-bit alignment. */
+ uint16_t ufid_len; /* Length of structure. */
+ uint16_t ufid_pad; /* Force 32-bit alignment. */
int32_t ufid_gen; /* Generation number. */
- u_int64_t ufid_ino; /* File number (ino). */
+ uint64_t ufid_ino; /* File number (ino). */
};
/* Filehandle structure for exported LFSes */
struct lfid {
Index: src/sys/ufs/lfs/ulfs_quota.h
diff -u src/sys/ufs/lfs/ulfs_quota.h:1.6 src/sys/ufs/lfs/ulfs_quota.h:1.7
--- src/sys/ufs/lfs/ulfs_quota.h:1.6 Sun Jun 19 23:06:09 2016
+++ src/sys/ufs/lfs/ulfs_quota.h Mon Jun 20 03:29:52 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_quota.h,v 1.6 2016/06/19 23:06:09 dholland Exp $ */
+/* $NetBSD: ulfs_quota.h,v 1.7 2016/06/20 03:29:52 dholland Exp $ */
/* from NetBSD: ufs_quota.h,v 1.22 2014/06/28 22:27:51 dholland Exp */
/*
@@ -60,10 +60,10 @@ struct dq2_desc {
*/
struct dquot {
LIST_ENTRY(dquot) dq_hash; /* h: hash list */
- u_int16_t dq_flags; /* d: flags, see below */
- u_int16_t dq_type; /* d: quota type of this dquot */
- u_int32_t dq_cnt; /* h: count of active references */
- u_int32_t dq_id; /* d: identifier this applies to */
+ uint16_t dq_flags; /* d: flags, see below */
+ uint16_t dq_type; /* d: quota type of this dquot */
+ uint32_t dq_cnt; /* h: count of active references */
+ uint32_t dq_id; /* d: identifier this applies to */
struct ulfsmount *dq_ump; /* d: filesystem this is taken from */
kmutex_t dq_interlock; /* d: lock this dquot */
union {
Index: src/sys/ufs/lfs/ulfs_quota1.h
diff -u src/sys/ufs/lfs/ulfs_quota1.h:1.4 src/sys/ufs/lfs/ulfs_quota1.h:1.5
--- src/sys/ufs/lfs/ulfs_quota1.h:1.4 Thu Jun 6 00:49:28 2013
+++ src/sys/ufs/lfs/ulfs_quota1.h Mon Jun 20 03:29:52 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_quota1.h,v 1.4 2013/06/06 00:49:28 dholland Exp $ */
+/* $NetBSD: ulfs_quota1.h,v 1.5 2016/06/20 03:29:52 dholland Exp $ */
/* from NetBSD: quota1.h,v 1.7 2012/08/26 02:32:14 dholland Exp */
/*
@@ -86,12 +86,12 @@
* structure).
*/
struct dqblk {
- u_int32_t dqb_bhardlimit; /* absolute limit on disk blks alloc */
- u_int32_t dqb_bsoftlimit; /* preferred limit on disk blks */
- u_int32_t dqb_curblocks; /* current block count */
- u_int32_t dqb_ihardlimit; /* maximum # allocated inodes + 1 */
- u_int32_t dqb_isoftlimit; /* preferred inode limit */
- u_int32_t dqb_curinodes; /* current # allocated inodes */
+ uint32_t dqb_bhardlimit; /* absolute limit on disk blks alloc */
+ uint32_t dqb_bsoftlimit; /* preferred limit on disk blks */
+ uint32_t dqb_curblocks; /* current block count */
+ uint32_t dqb_ihardlimit; /* maximum # allocated inodes + 1 */
+ uint32_t dqb_isoftlimit; /* preferred inode limit */
+ uint32_t dqb_curinodes; /* current # allocated inodes */
int32_t dqb_btime; /* time limit for excessive disk use */
int32_t dqb_itime; /* time limit for excessive files */
};
