rename struct dinode to ufs1_dinode. clears the namespace and makes

way for some future work.  no function changes yet.
few other little cleanups.
help testing otto@ and markus@

11 files changed, 111 insertions, 102 deletions

diff --git a/sys/ufs/ext2fs/ext2fs_alloc.c b/sys/ufs/ext2fs/ext2fs_alloc.c
index 6f1347817ef..60bb193f8d6 100644
--- a/sys/ufs/ext2fs/ext2fs_alloc.c
+++ b/sys/ufs/ext2fs/ext2fs_alloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_alloc.c,v 1.12 2003/07/06 05:24:16 tedu Exp $	*/
+/*	$OpenBSD: ext2fs_alloc.c,v 1.13 2003/08/25 23:26:55 tedu Exp $	*/
 /*	$NetBSD: ext2fs_alloc.c,v 1.10 2001/07/05 08:38:27 toshii Exp $	*/
 
 /*
@@ -169,7 +169,7 @@ ext2fs_inode_alloc(struct inode *pip, int mode, struct ucred *cred,
 		panic("ext2fs_valloc: dup alloc");
 	}
 
-	bzero(&(ip->i_din.e2fs_din), sizeof(struct ext2fs_dinode));
+	bzero(&(ip->i_e2din), sizeof(struct ext2fs_dinode));
 
 	/*
 	 * Set up a new generation number for this inode.
diff --git a/sys/ufs/ext2fs/ext2fs_inode.c b/sys/ufs/ext2fs/ext2fs_inode.c
index 9cd114dc04c..5a9c898ac54 100644
--- a/sys/ufs/ext2fs/ext2fs_inode.c
+++ b/sys/ufs/ext2fs/ext2fs_inode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_inode.c,v 1.23 2003/06/02 23:28:22 millert Exp $	*/
+/*	$OpenBSD: ext2fs_inode.c,v 1.24 2003/08/25 23:26:55 tedu Exp $	*/
 /*	$NetBSD: ext2fs_inode.c,v 1.24 2001/06/19 12:59:18 wiz Exp $	*/
 
 /*
@@ -147,7 +147,7 @@ ext2fs_update(struct inode *ip, struct timespec *atime, struct timespec *mtime,
 	ip->i_flag &= ~(IN_MODIFIED);
 	cp = (caddr_t)bp->b_data +
 	    (ino_to_fsbo(fs, ip->i_number) * EXT2_DINODE_SIZE);
-	e2fs_isave(&ip->i_din.e2fs_din, (struct ext2fs_dinode *)cp);
+	e2fs_isave(&ip->i_e2din, (struct ext2fs_dinode *)cp);
 	if (waitfor)
 		return (bwrite(bp));
 	else {
@@ -194,7 +194,7 @@ ext2fs_truncate(struct inode *oip, off_t length, int flags, struct ucred *cred)
 		if (length != 0)
 			panic("ext2fs_truncate: partial truncate of symlink");
 #endif
-		bzero((char *)&oip->i_din.e2fs_din.e2di_shortlink,
+		bzero((char *)&oip->i_e2din.e2di_shortlink,
 			(u_int)oip->i_e2fs_size);
 		oip->i_e2fs_size = 0;
 		oip->i_flag |= IN_CHANGE | IN_UPDATE;
diff --git a/sys/ufs/ext2fs/ext2fs_vfsops.c b/sys/ufs/ext2fs/ext2fs_vfsops.c
index ee61f0a73eb..5914318ebf7 100644
--- a/sys/ufs/ext2fs/ext2fs_vfsops.c
+++ b/sys/ufs/ext2fs/ext2fs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_vfsops.c,v 1.29 2003/08/14 07:46:40 mickey Exp $	*/
+/*	$OpenBSD: ext2fs_vfsops.c,v 1.30 2003/08/25 23:26:55 tedu Exp $	*/
 /*	$NetBSD: ext2fs_vfsops.c,v 1.1 1997/06/11 09:34:07 bouyer Exp $	*/
 
 /*
@@ -362,7 +362,7 @@ ext2fs_reload_vnode(struct vnode *vp, void *args) {
 	}
 	cp = (caddr_t)bp->b_data +
 	    (ino_to_fsbo(era->fs, ip->i_number) * EXT2_DINODE_SIZE);
-	e2fs_iload((struct ext2fs_dinode *)cp, &ip->i_din.e2fs_din);
+	e2fs_iload((struct ext2fs_dinode *)cp, &ip->i_e2din);
 	brelse(bp);
 	vput(vp);
 	return (0);
@@ -892,7 +892,7 @@ ext2fs_vget(mp, ino, vpp)
 		return (error);
 	}
 	bcopy(((struct ext2fs_dinode*)bp->b_data + ino_to_fsbo(fs, ino)),
-				&ip->i_din, sizeof(struct ext2fs_dinode));
+				&ip->i_e2din, sizeof(struct ext2fs_dinode));
 	ip->i_effnlink = ip->i_e2fs_nlink;
 	brelse(bp);
 
diff --git a/sys/ufs/ext2fs/ext2fs_vnops.c b/sys/ufs/ext2fs/ext2fs_vnops.c
index b972e9908d9..218f5f49024 100644
--- a/sys/ufs/ext2fs/ext2fs_vnops.c
+++ b/sys/ufs/ext2fs/ext2fs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_vnops.c,v 1.29 2003/08/15 20:32:20 tedu Exp $	*/
+/*	$OpenBSD: ext2fs_vnops.c,v 1.30 2003/08/25 23:26:55 tedu Exp $	*/
 /*	$NetBSD: ext2fs_vnops.c,v 1.1 1997/06/11 09:34:09 bouyer Exp $	*/
 
 /*
@@ -140,7 +140,7 @@ ext2fs_mknod(v)
 		 * Want to be able to use this to make badblock
 		 * inodes, so don't truncate the dev number.
 		 */
-		ip->i_din.e2fs_din.e2di_rdev = h2fs32(vap->va_rdev);
+		ip->i_e2din.e2di_rdev = h2fs32(vap->va_rdev);
 	}
 	/*
 	 * Remove inode so that it will be reloaded by VFS_VGET and
@@ -227,7 +227,7 @@ ext2fs_getattr(v)
 	vap->va_nlink = ip->i_e2fs_nlink;
 	vap->va_uid = ip->i_e2fs_uid;
 	vap->va_gid = ip->i_e2fs_gid;
-	vap->va_rdev = (dev_t)fs2h32(ip->i_din.e2fs_din.e2di_rdev);
+	vap->va_rdev = (dev_t)fs2h32(ip->i_e2din.e2di_rdev);
 	vap->va_size = ip->i_e2fs_size;
 	vap->va_atime.tv_sec = ip->i_e2fs_atime;
 	vap->va_atime.tv_nsec = 0;
@@ -1177,7 +1177,7 @@ ext2fs_symlink(v)
 	len = strlen(ap->a_target);
 	if (len < vp->v_mount->mnt_maxsymlinklen) {
 		ip = VTOI(vp);
-		bcopy(ap->a_target, (char *)ip->i_din.e2fs_din.e2di_shortlink, len);
+		bcopy(ap->a_target, (char *)ip->i_e2din.e2di_shortlink, len);
 		ip->i_e2fs_size = len;
 		ip->i_flag |= IN_CHANGE | IN_UPDATE;
 	} else
@@ -1207,7 +1207,7 @@ ext2fs_readlink(v)
 	isize = ip->i_e2fs_size;
 	if (isize < vp->v_mount->mnt_maxsymlinklen ||
 	    (vp->v_mount->mnt_maxsymlinklen == 0 && ip->i_e2fs_nblock == 0)) {
-		uiomove((char *)ip->i_din.e2fs_din.e2di_shortlink, isize, ap->a_uio);
+		uiomove((char *)ip->i_e2din.e2di_shortlink, isize, ap->a_uio);
 		return (0);
 	}
 	return (VOP_READ(vp, ap->a_uio, 0, ap->a_cred));
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index 7abf6144887..f71b2dc7fe1 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_inode.c,v 1.33 2003/06/02 23:28:23 millert Exp $	*/
+/*	$OpenBSD: ffs_inode.c,v 1.34 2003/08/25 23:26:55 tedu Exp $	*/
 /*	$NetBSD: ffs_inode.c,v 1.10 1996/05/11 18:27:19 mycroft Exp $	*/
 
 /*
@@ -110,8 +110,8 @@ ffs_update(struct inode *ip, struct timespec *atime,
 	 * fix until fsck has been changed to do the update.
 	 */
 	if (fs->fs_inodefmt < FS_44INODEFMT) {		/* XXX */
-		ip->i_din.ffs_din.di_ouid = ip->i_ffs_uid;		/* XXX */
-		ip->i_din.ffs_din.di_ogid = ip->i_ffs_gid;		/* XXX */
+		ip->i_din1.di_ouid = ip->i_ffs_uid;		/* XXX */
+		ip->i_din1.di_ogid = ip->i_ffs_gid;		/* XXX */
 	}						/* XXX */
 	error = bread(ip->i_devvp, fsbtodb(fs, ino_to_fsba(fs, ip->i_number)),
 		(int)fs->fs_bsize, NOCRED, &bp);
@@ -125,8 +125,8 @@ ffs_update(struct inode *ip, struct timespec *atime,
 	else if (ip->i_effnlink != ip->i_ffs_nlink) 
 		panic("ffs_update: bad link cnt");
 
-	*((struct dinode *)bp->b_data +
-	    ino_to_fsbo(fs, ip->i_number)) = ip->i_din.ffs_din;
+	*((struct ufs1_dinode *)bp->b_data +
+	    ino_to_fsbo(fs, ip->i_number)) = ip->i_din1;
 	if (waitfor && !DOINGASYNC(vp)) {
 		return (bwrite(bp));
 	} else {
@@ -171,7 +171,7 @@ ffs_truncate(struct inode *oip, off_t length, int flags, struct ucred *cred)
 	if (ovp->v_type == VLNK &&
 	    (oip->i_ffs_size < ovp->v_mount->mnt_maxsymlinklen ||
 	     (ovp->v_mount->mnt_maxsymlinklen == 0 &&
-	      oip->i_din.ffs_din.di_blocks == 0))) {
+	      oip->i_din1.di_blocks == 0))) {
 #ifdef DIAGNOSTIC
 		if (length != 0)
 			panic("ffs_truncate: partial truncate of symlink");
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 3bce74dd56c..0d750619478 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_softdep.c,v 1.45 2003/08/02 01:47:17 tedu Exp $	*/
+/*	$OpenBSD: ffs_softdep.c,v 1.46 2003/08/25 23:26:55 tedu Exp $	*/
 /*
  * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved.
  *
@@ -1896,8 +1896,8 @@ softdep_setup_freeblocks(ip, length)
 	    fsbtodb(fs, ino_to_fsba(fs, ip->i_number)),
 	    (int)fs->fs_bsize, NOCRED, &bp)) != 0)
 		softdep_error("softdep_setup_freeblocks", error);
-	*((struct dinode *)bp->b_data + ino_to_fsbo(fs, ip->i_number)) =
-	    ip->i_din.ffs_din;
+	*((struct ufs1_dinode *)bp->b_data + ino_to_fsbo(fs, ip->i_number)) =
+	    ip->i_din1;
 	/*
 	 * Find and eliminate any inode dependencies.
 	 */
@@ -3194,7 +3194,7 @@ initiate_write_inodeblock(inodedep, bp)
 	struct buf *bp;			/* The inode block */
 {
 	struct allocdirect *adp, *lastadp;
-	struct dinode *dp;
+	struct ufs1_dinode *dp;
 	struct fs *fs;
 #ifdef DIAGNOSTIC
 	ufs_lbn_t prevlbn = 0;
@@ -3205,7 +3205,7 @@ initiate_write_inodeblock(inodedep, bp)
 		panic("initiate_write_inodeblock: already started");
 	inodedep->id_state |= IOSTARTED;
 	fs = inodedep->id_fs;
-	dp = (struct dinode *)bp->b_data +
+	dp = (struct ufs1_dinode *)bp->b_data +
 	    ino_to_fsbo(fs, inodedep->id_ino);
 	/*
 	 * If the bitmap is not yet written, then the allocated
@@ -3214,10 +3214,10 @@ initiate_write_inodeblock(inodedep, bp)
 	if ((inodedep->id_state & DEPCOMPLETE) == 0) {
 		if (inodedep->id_savedino != NULL)
 			panic("initiate_write_inodeblock: already doing I/O");
-		MALLOC(inodedep->id_savedino, struct dinode *,
-		    sizeof(struct dinode), M_INODEDEP, M_WAITOK);
+		MALLOC(inodedep->id_savedino, struct ufs1_dinode *,
+		    sizeof(struct ufs1_dinode), M_INODEDEP, M_WAITOK);
 		*inodedep->id_savedino = *dp;
-		bzero((caddr_t)dp, sizeof(struct dinode));
+		bzero((caddr_t)dp, sizeof(struct ufs1_dinode));
 		return;
 	}
 	/*
@@ -3570,14 +3570,14 @@ handle_written_inodeblock(inodedep, bp)
 {
 	struct worklist *wk, *filefree;
 	struct allocdirect *adp, *nextadp;
-	struct dinode *dp;
+	struct ufs1_dinode *dp;
 	int hadchanges;
 
 	if ((inodedep->id_state & IOSTARTED) == 0)
 		panic("handle_written_inodeblock: not started");
 	inodedep->id_state &= ~IOSTARTED;
 	inodedep->id_state |= COMPLETE;
-	dp = (struct dinode *)bp->b_data +
+	dp = (struct ufs1_dinode *)bp->b_data +
 	    ino_to_fsbo(inodedep->id_fs, inodedep->id_ino);
 	/*
 	 * If we had to rollback the inode allocation because of
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index a5f771cb907..5881672e7d2 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_vfsops.c,v 1.58 2003/08/14 07:46:40 mickey Exp $	*/
+/*	$OpenBSD: ffs_vfsops.c,v 1.59 2003/08/25 23:26:55 tedu Exp $	*/
 /*	$NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $	*/
 
 /*
@@ -483,7 +483,7 @@ ffs_reload_vnode(struct vnode *vp, void *args)
 		vput(vp);
 		return (error);
 	}
-	ip->i_din.ffs_din = *((struct dinode *)bp->b_data +
+	ip->i_din1 = *((struct ufs1_dinode *)bp->b_data +
 	    ino_to_fsbo(fra->fs, ip->i_number));
 	ip->i_effnlink = ip->i_ffs_nlink;
 	brelse(bp);
@@ -1196,7 +1196,7 @@ retry:
 		*vpp = NULL;
 		return (error);
 	}
-	ip->i_din.ffs_din = *((struct dinode *)bp->b_data + ino_to_fsbo(fs, ino));
+	ip->i_din1 = *((struct ufs1_dinode *)bp->b_data + ino_to_fsbo(fs, ino));
 	if (DOINGSOFTDEP(vp))
 		softdep_load_inodeblock(ip);
 	else
@@ -1234,8 +1234,8 @@ retry:
 	 * fix until fsck has been changed to do the update.
 	 */
 	if (fs->fs_inodefmt < FS_44INODEFMT) {			/* XXX */
-		ip->i_ffs_uid = ip->i_din.ffs_din.di_ouid;	/* XXX */
-		ip->i_ffs_gid = ip->i_din.ffs_din.di_ogid;	/* XXX */
+		ip->i_ffs_uid = ip->i_din1.di_ouid;		/* XXX */
+		ip->i_ffs_gid = ip->i_din1.di_ogid;		/* XXX */
 	}							/* XXX */
 
 	*vpp = vp;
diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h
index 0138c7dced5..7e58d88d679 100644
--- a/sys/ufs/ffs/fs.h
+++ b/sys/ufs/ffs/fs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fs.h,v 1.13 2003/06/02 23:28:23 millert Exp $	*/
+/*	$OpenBSD: fs.h,v 1.14 2003/08/25 23:26:55 tedu Exp $	*/
 /*	$NetBSD: fs.h,v 1.6 1995/04/12 21:21:02 mycroft Exp $	*/
 
 /*
@@ -167,10 +167,10 @@ struct csum {
 struct fs {
 	int32_t	 fs_firstfield;		/* historic file system linked list, */
 	int32_t	 fs_unused_1;		/*     used for incore super blocks */
-	daddr_t	 fs_sblkno;		/* addr of super-block in filesys */
-	daddr_t	 fs_cblkno;		/* offset of cyl-block in filesys */
-	daddr_t	 fs_iblkno;		/* offset of inode-blocks in filesys */
-	daddr_t	 fs_dblkno;		/* offset of first data after cg */
+	int32_t	 fs_sblkno;		/* addr of super-block in filesys */
+	int32_t	 fs_cblkno;		/* offset of cyl-block in filesys */
+	int32_t	 fs_iblkno;		/* offset of inode-blocks in filesys */
+	int32_t	 fs_dblkno;		/* offset of first data after cg */
 	int32_t	 fs_cgoffset;		/* cylinder group offset in cylinder */
 	int32_t	 fs_cgmask;		/* used to calc mod fs_ntrak */
 	time_t 	 fs_time;		/* last time written */
@@ -210,7 +210,7 @@ struct fs {
 /* fs_id takes the space of the unused fs_headswitch and fs_trkseek fields */
 	int32_t  fs_id[2];		/* unique filesystem id */
 /* sizes determined by number of cylinder groups and their sizes */
-	daddr_t  fs_csaddr;		/* blk addr of cyl grp summary area */
+	int32_t  fs_csaddr;		/* blk addr of cyl grp summary area */
 	int32_t	 fs_cssize;		/* size of cyl grp summary area */
 	int32_t	 fs_cgsize;		/* cylinder group size */
 /* these fields are derived from the hardware */
diff --git a/sys/ufs/ffs/softdep.h b/sys/ufs/ffs/softdep.h
index bd1e575e3a2..3e310966005 100644
--- a/sys/ufs/ffs/softdep.h
+++ b/sys/ufs/ffs/softdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softdep.h,v 1.5 2003/05/26 18:33:17 tedu Exp $	*/
+/*	$OpenBSD: softdep.h,v 1.6 2003/08/25 23:26:55 tedu Exp $	*/
 /*
  * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved.
  *
@@ -238,7 +238,7 @@ struct inodedep {
 	struct	fs *id_fs;		/* associated filesystem */
 	ino_t	id_ino;			/* dependent inode */
 	nlink_t	id_nlinkdelta;		/* saved effective link count */
-	struct	dinode *id_savedino;	/* saved dinode contents */
+	struct	ufs1_dinode *id_savedino;	/* saved dinode contents */
 	LIST_ENTRY(inodedep) id_deps;	/* bmsafemap's list of inodedep's */
 	struct	buf *id_buf;		/* related bmsafemap (if pending) */
 	off_t	id_savedsize;		/* file size saved during rollback */
diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h
index ff2dd66c37f..577945c1b8f 100644
--- a/sys/ufs/ufs/dinode.h
+++ b/sys/ufs/ufs/dinode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dinode.h,v 1.7 2003/06/02 23:28:23 millert Exp $	*/
+/*	$OpenBSD: dinode.h,v 1.8 2003/08/25 23:26:55 tedu Exp $	*/
 /*	$NetBSD: dinode.h,v 1.7 1995/06/15 23:22:48 cgd Exp $	*/
 
 /*
@@ -68,7 +68,7 @@ typedef int32_t ufs1_daddr_t;
 #define	NDADDR	12			/* Direct addresses in inode. */
 #define	NIADDR	3			/* Indirect addresses in inode. */
 
-struct dinode {
+struct	ufs1_dinode {
 	u_int16_t	di_mode;	/*   0: IFMT, permissions; see below. */
 	int16_t		di_nlink;	/*   2: File link count. */
 	union {
diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h
index 2dedcb630ca..e8a3f2b9bb9 100644
--- a/sys/ufs/ufs/inode.h
+++ b/sys/ufs/ufs/inode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inode.h,v 1.22 2003/06/02 23:28:23 millert Exp $	*/
+/*	$OpenBSD: inode.h,v 1.23 2003/08/25 23:26:55 tedu Exp $	*/
 /*	$NetBSD: inode.h,v 1.8 1995/06/15 23:22:50 cgd Exp $	*/
 
 /*
@@ -108,9 +108,11 @@ struct inode {
 	 * The on-disk dinode itself.
 	 */
 	union {
-		struct	dinode ffs_din;	/* 128 bytes of the on-disk dinode. */
-		struct ext2fs_dinode e2fs_din; /* 128 bytes of the on-disk dinode. */
-	} i_din;
+		struct ufs1_dinode ffs1_din;
+		struct ext2fs_dinode e2fs_din;
+	} dinode_u;
+#define i_din1 dinode_u.ffs1_din
+#define	i_e2din	dinode_u.e2fs_din
 
 	struct inode_vtbl *i_vtbl;
 };
@@ -152,24 +154,24 @@ struct inode_vtbl {
     ((ip)->i_vtbl->iv_bufatoff)((ip), (offset), (res), (bpp))
 
 
-#define	i_ffs_atime		i_din.ffs_din.di_atime
-#define	i_ffs_atimensec		i_din.ffs_din.di_atimensec
-#define	i_ffs_blocks		i_din.ffs_din.di_blocks
-#define	i_ffs_ctime		i_din.ffs_din.di_ctime
-#define	i_ffs_ctimensec		i_din.ffs_din.di_ctimensec
-#define	i_ffs_db		i_din.ffs_din.di_db
-#define	i_ffs_flags		i_din.ffs_din.di_flags
-#define	i_ffs_gen		i_din.ffs_din.di_gen
-#define	i_ffs_gid		i_din.ffs_din.di_gid
-#define	i_ffs_ib		i_din.ffs_din.di_ib
-#define	i_ffs_mode		i_din.ffs_din.di_mode
-#define	i_ffs_mtime		i_din.ffs_din.di_mtime
-#define	i_ffs_mtimensec		i_din.ffs_din.di_mtimensec
-#define	i_ffs_nlink		i_din.ffs_din.di_nlink
-#define	i_ffs_rdev		i_din.ffs_din.di_rdev
-#define	i_ffs_shortlink		i_din.ffs_din.di_shortlink
-#define	i_ffs_size		i_din.ffs_din.di_size
-#define	i_ffs_uid		i_din.ffs_din.di_uid
+#define	i_ffs_atime		i_din1.di_atime
+#define	i_ffs_atimensec		i_din1.di_atimensec
+#define	i_ffs_blocks		i_din1.di_blocks
+#define	i_ffs_ctime		i_din1.di_ctime
+#define	i_ffs_ctimensec		i_din1.di_ctimensec
+#define	i_ffs_db		i_din1.di_db
+#define	i_ffs_flags		i_din1.di_flags
+#define	i_ffs_gen		i_din1.di_gen
+#define	i_ffs_gid		i_din1.di_gid
+#define	i_ffs_ib		i_din1.di_ib
+#define	i_ffs_mode		i_din1.di_mode
+#define	i_ffs_mtime		i_din1.di_mtime
+#define	i_ffs_mtimensec		i_din1.di_mtimensec
+#define	i_ffs_nlink		i_din1.di_nlink
+#define	i_ffs_rdev		i_din1.di_rdev
+#define	i_ffs_shortlink		i_din1.di_shortlink
+#define	i_ffs_size		i_din1.di_size
+#define	i_ffs_uid		i_din1.di_uid
 
 #ifndef _KERNEL
 /*
@@ -177,44 +179,44 @@ struct inode_vtbl {
  * They allow direct references to FFS structures using the old names.
  */
 
-#define	i_atime			i_din.ffs_din.di_atime
-#define	i_atimensec		i_din.ffs_din.di_atimensec
-#define	i_blocks		i_din.ffs_din.di_blocks
-#define	i_ctime			i_din.ffs_din.di_ctime
-#define	i_ctimensec		i_din.ffs_din.di_ctimensec
-#define	i_db			i_din.ffs_din.di_db
-#define	i_flags			i_din.ffs_din.di_flags
-#define	i_gen			i_din.ffs_din.di_gen
-#define	i_gid			i_din.ffs_din.di_gid
-#define	i_ib			i_din.ffs_din.di_ib
-#define	i_mode			i_din.ffs_din.di_mode
-#define	i_mtime			i_din.ffs_din.di_mtime
-#define	i_mtimensec		i_din.ffs_din.di_mtimensec
-#define	i_nlink			i_din.ffs_din.di_nlink
-#define	i_rdev			i_din.ffs_din.di_rdev
-#define	i_shortlink		i_din.ffs_din.di_shortlink
-#define	i_size			i_din.ffs_din.di_size
-#define	i_uid			i_din.ffs_din.di_uid
+#define	i_atime			i_din1.di_atime
+#define	i_atimensec		i_din1.di_atimensec
+#define	i_blocks		i_din1.di_blocks
+#define	i_ctime			i_din1.di_ctime
+#define	i_ctimensec		i_din1.di_ctimensec
+#define	i_db			i_din1.di_db
+#define	i_flags			i_din1.di_flags
+#define	i_gen			i_din1.di_gen
+#define	i_gid			i_din1.di_gid
+#define	i_ib			i_din1.di_ib
+#define	i_mode			i_din1.di_mode
+#define	i_mtime			i_din1.di_mtime
+#define	i_mtimensec		i_din1.di_mtimensec
+#define	i_nlink			i_din1.di_nlink
+#define	i_rdev			i_din1.di_rdev
+#define	i_shortlink		i_din1.di_shortlink
+#define	i_size			i_din1.di_size
+#define	i_uid			i_din1.di_uid
 #endif	/* _KERNEL */
 
-#define i_e2fs_mode		i_din.e2fs_din.e2di_mode
-#define i_e2fs_uid		i_din.e2fs_din.e2di_uid
-#define i_e2fs_size		i_din.e2fs_din.e2di_size
-#define i_e2fs_atime		i_din.e2fs_din.e2di_atime
-#define i_e2fs_ctime		i_din.e2fs_din.e2di_ctime
-#define i_e2fs_mtime		i_din.e2fs_din.e2di_mtime
-#define i_e2fs_dtime		i_din.e2fs_din.e2di_dtime
-#define i_e2fs_gid		i_din.e2fs_din.e2di_gid
-#define i_e2fs_nlink		i_din.e2fs_din.e2di_nlink
-#define i_e2fs_nblock		i_din.e2fs_din.e2di_nblock
-#define i_e2fs_flags		i_din.e2fs_din.e2di_flags
-#define i_e2fs_blocks		i_din.e2fs_din.e2di_blocks
-#define i_e2fs_gen		i_din.e2fs_din.e2di_gen
-#define i_e2fs_facl		i_din.e2fs_din.e2di_facl
-#define i_e2fs_dacl		i_din.e2fs_din.e2di_dacl
-#define i_e2fs_faddr		i_din.e2fs_din.e2di_faddr
-#define i_e2fs_nfrag		i_din.e2fs_din.e2di_nfrag
-#define i_e2fs_fsize		i_din.e2fs_din.e2di_fsize
+#define i_e2fs_mode		i_e2din.e2di_mode
+#define i_e2fs_uid		i_e2din.e2di_uid
+#define i_e2fs_size		i_e2din.e2di_size
+#define i_e2fs_atime		i_e2din.e2di_atime
+#define i_e2fs_ctime		i_e2din.e2di_ctime
+#define i_e2fs_mtime		i_e2din.e2di_mtime
+#define i_e2fs_dtime		i_e2din.e2di_dtime
+#define i_e2fs_gid		i_e2din.e2di_gid
+#define i_e2fs_nlink		i_e2din.e2di_nlink
+#define i_e2fs_nblock		i_e2din.e2di_nblock
+#define i_e2fs_flags		i_e2din.e2di_flags
+#define i_e2fs_blocks		i_e2din.e2di_blocks
+#define i_e2fs_gen		i_e2din.e2di_gen
+#define i_e2fs_facl		i_e2din.e2di_facl
+#define i_e2fs_dacl		i_e2din.e2di_dacl
+#define i_e2fs_faddr		i_e2din.e2di_faddr
+#define i_e2fs_nfrag		i_e2din.e2di_nfrag
+#define i_e2fs_fsize		i_e2din.e2di_fsize
 
 /* These flags are kept in i_flag. */
 #define	IN_ACCESS	0x0001		/* Access time update request. */
@@ -227,6 +229,13 @@ struct inode_vtbl {
 
 #ifdef _KERNEL
 /*
+ * The DIP macro is used to access fields in the dinode that are
+ * not cached in the inode itself.
+ */
+#define	DIP(ip, field) \
+	((ip)->i_din1.d##field)
+
+/*
  * Structure used to pass around logical block paths generated by
  * ufs_getlbns and used by truncate and bmap code.
  */