Module Name: src
Committed By: dholland
Date: Sat Jun 8 23:04:49 UTC 2013
Modified Files:
src/sys/ufs/lfs: lfs.h lfs_inode.h
Log Message:
Remove stale union and accessor macros.
To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/sys/ufs/lfs/lfs.h
cvs rdiff -u -r1.1 -r1.2 src/sys/ufs/lfs/lfs_inode.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.h
diff -u src/sys/ufs/lfs/lfs.h:1.150 src/sys/ufs/lfs/lfs.h:1.151
--- src/sys/ufs/lfs/lfs.h:1.150 Sat Jun 8 22:23:52 2013
+++ src/sys/ufs/lfs/lfs.h Sat Jun 8 23:04:49 2013
@@ -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 @@ struct lfs_odirtemplate {
*/
/*
- * 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 lfs_odirtemplate {
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 @@ struct ulfs2_dinode {
* 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. */
Index: src/sys/ufs/lfs/lfs_inode.h
diff -u src/sys/ufs/lfs/lfs_inode.h:1.1 src/sys/ufs/lfs/lfs_inode.h:1.2
--- src/sys/ufs/lfs/lfs_inode.h:1.1 Sat Jun 8 02:04:31 2013
+++ src/sys/ufs/lfs/lfs_inode.h Sat Jun 8 23:04:49 2013
@@ -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 @@ struct inode {
#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
