[src/trunk]: src/sys/ufs move i_e2fs_* defines from ufs/inode.h to ext2fs/ext...

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

details:   https://anonhg.NetBSD.org/src/rev/ca3ee5354e03
branches:  trunk
changeset: 346835:ca3ee5354e03
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Thu Aug 04 17:47:47 2016 +0000

description:
move i_e2fs_* defines from ufs/inode.h to ext2fs/ext2fs_dinode.h, where they belong; they don't seem to be used anywhere else then ext2fs code any more

diffstat:

 sys/ufs/ext2fs/ext2fs_dinode.h |  23 ++++++++++++++++++++++-
 sys/ufs/ufs/inode.h            |  23 +----------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diffs (74 lines):

diff -r ed5409592671 -r ca3ee5354e03 sys/ufs/ext2fs/ext2fs_dinode.h
--- a/sys/ufs/ext2fs/ext2fs_dinode.h    Thu Aug 04 17:43:47 2016 +0000
+++ b/sys/ufs/ext2fs/ext2fs_dinode.h    Thu Aug 04 17:47:47 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ext2fs_dinode.h,v 1.32 2016/08/04 17:43:48 jdolecek Exp $      */
+/*     $NetBSD: ext2fs_dinode.h,v 1.33 2016/08/04 17:47:48 jdolecek Exp $      */
 
 /*
  * Copyright (c) 1982, 1989, 1993
@@ -145,6 +145,27 @@
 /* XXX how does this differ from EXT2_MAXSYMLINKLEN above? */
 #define        E2MAXSYMLINKLEN ((EXT2FS_NDADDR + EXT2FS_NIADDR) * sizeof(uint32_t))
 
+#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_version          i_din.e2fs_din->e2di_version
+#define        i_e2fs_blocks           i_din.e2fs_din->e2di_blocks
+#define        i_e2fs_rdev             i_din.e2fs_din->e2di_rdev
+#define        i_e2fs_gen              i_din.e2fs_din->e2di_gen
+#define        i_e2fs_facl             i_din.e2fs_din->e2di_facl
+#define        i_e2fs_nblock_high      i_din.e2fs_din->e2di_nblock_high
+#define        i_e2fs_facl_high        i_din.e2fs_din->e2di_facl_high
+#define        i_e2fs_uid_high         i_din.e2fs_din->e2di_uid_high
+#define        i_e2fs_gid_high         i_din.e2fs_din->e2di_gid_high
+
 /* File permissions. */
 #define        EXT2_IEXEC              0000100         /* Executable. */
 #define        EXT2_IWRITE             0000200         /* Writable. */
diff -r ed5409592671 -r ca3ee5354e03 sys/ufs/ufs/inode.h
--- a/sys/ufs/ufs/inode.h       Thu Aug 04 17:43:47 2016 +0000
+++ b/sys/ufs/ufs/inode.h       Thu Aug 04 17:47:47 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: inode.h,v 1.73 2016/08/04 17:43:48 jdolecek Exp $      */
+/*     $NetBSD: inode.h,v 1.74 2016/08/04 17:47:47 jdolecek Exp $      */
 
 /*
  * Copyright (c) 1982, 1989, 1993
@@ -210,27 +210,6 @@
 #define        i_ffs2_extsize          i_din.ffs2_din->di_extsize
 #define        i_ffs2_extb             i_din.ffs2_din->di_extb
 
-#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_version          i_din.e2fs_din->e2di_version
-#define        i_e2fs_blocks           i_din.e2fs_din->e2di_blocks
-#define        i_e2fs_rdev             i_din.e2fs_din->e2di_rdev
-#define        i_e2fs_gen              i_din.e2fs_din->e2di_gen
-#define        i_e2fs_facl             i_din.e2fs_din->e2di_facl
-#define        i_e2fs_nblock_high      i_din.e2fs_din->e2di_nblock_high
-#define        i_e2fs_facl_high        i_din.e2fs_din->e2di_facl_high
-#define        i_e2fs_uid_high         i_din.e2fs_din->e2di_uid_high
-#define        i_e2fs_gid_high         i_din.e2fs_din->e2di_gid_high
-
 /* These flags are kept in i_flag. */
 #define        IN_ACCESS       0x0001          /* Access time update request. */
 #define        IN_CHANGE       0x0002          /* Inode change time update request. */