[src/trunk]: src/sys/ufs/lfs Remove stale union and accessor macros.

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1bd3888a78d8
branches:  trunk
changeset: 787266:1bd3888a78d8
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sat Jun 08 23:04:49 2013 +0000

description:
Remove stale union and accessor macros.

diffstat:

 sys/ufs/lfs/lfs.h       |  12 +++---------
 sys/ufs/lfs/lfs_inode.h |   4 +---
 2 files changed, 4 insertions(+), 12 deletions(-)

diffs (58 lines):

diff -r fe4e9f974464 -r 1bd3888a78d8 sys/ufs/lfs/lfs.h
--- a/sys/ufs/lfs/lfs.h Sat Jun 08 22:45:28 2013 +0000
+++ b/sys/ufs/lfs/lfs.h Sat Jun 08 23:04:49 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs.h,v 1.150 2013/06/08 22:23:52 dholland Exp $       */
+/*     $NetBSD: lfs.h,v 1.151 2013/06/08 23:04:49 dholland Exp $       */
 
 /*  from NetBSD: dinode.h,v 1.22 2013/01/22 09:39:18 dholland Exp  */
 /*  from NetBSD: dir.h,v 1.21 2009/07/22 04:49:19 dholland Exp  */
@@ -420,7 +420,7 @@
  */
 
 /*
- * A dinode contains all the meta-data associated with a ULFS file.
+ * A dinode contains all the meta-data associated with a LFS file.
  * This structure defines the on-disk format of a dinode. Since
  * this structure describes an on-disk structure, all its fields
  * are defined by types with precise widths.
@@ -429,10 +429,7 @@
 struct ulfs1_dinode {
        u_int16_t       di_mode;        /*   0: IFMT, permissions; see below. */
        int16_t         di_nlink;       /*   2: File link count. */
-       union {
-               u_int16_t oldids[2];    /*   4: Ffs: old user and group ids. */
-               u_int32_t inumber;      /*   4: Lfs: inode number. */
-       } di_u;
+       u_int32_t       di_inumber;     /*   4: Inode number. */
        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. */
@@ -484,9 +481,6 @@
  * dev_t value. Short symbolic links place their path in the
  * di_db area.
  */
-#define        di_inumber      di_u.inumber
-#define        di_ogid         di_u.oldids[1]
-#define        di_ouid         di_u.oldids[0]
 #define        di_rdev         di_db[0]
 
 /* Size of the on-disk inode. */
diff -r fe4e9f974464 -r 1bd3888a78d8 sys/ufs/lfs/lfs_inode.h
--- a/sys/ufs/lfs/lfs_inode.h   Sat Jun 08 22:45:28 2013 +0000
+++ b/sys/ufs/lfs/lfs_inode.h   Sat Jun 08 23:04:49 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_inode.h,v 1.1 2013/06/08 02:04:31 dholland Exp $   */
+/*     $NetBSD: lfs_inode.h,v 1.2 2013/06/08 23:04:49 dholland Exp $   */
 /*  from NetBSD: ulfs_inode.h,v 1.5 2013/06/06 00:51:50 dholland Exp  */
 /*  from NetBSD: inode.h,v 1.64 2012/11/19 00:36:21 jakllsch Exp  */
 
@@ -172,8 +172,6 @@
 #define        i_ffs1_rdev             i_din.ffs1_din->di_rdev
 #define        i_ffs1_size             i_din.ffs1_din->di_size
 #define        i_ffs1_uid              i_din.ffs1_din->di_uid
-#define        i_ffs1_ouid             i_din.ffs1_din->di_u.oldids[0]
-#define        i_ffs1_ogid             i_din.ffs1_din->di_u.oldids[1]
 
 #define        i_ffs2_atime            i_din.ffs2_din->di_atime
 #define        i_ffs2_atimensec        i_din.ffs2_din->di_atimensec