[src/trunk]: src/sys/ufs/lfs Now move LFS_IFMT and friends from ulfs_dinode.h...

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

details:   https://anonhg.NetBSD.org/src/rev/3af18cb19d36
branches:  trunk
changeset: 787241:3af18cb19d36
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sat Jun 08 02:11:49 2013 +0000

description:
Now move LFS_IFMT and friends from ulfs_dinode.h to lfs.h.

diffstat:

 sys/ufs/lfs/lfs.h         |  13 ++++++++++++-
 sys/ufs/lfs/ulfs_dinode.h |  13 +------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diffs (52 lines):

diff -r 1e3a61a300e1 -r 3af18cb19d36 sys/ufs/lfs/lfs.h
--- a/sys/ufs/lfs/lfs.h Sat Jun 08 02:11:11 2013 +0000
+++ b/sys/ufs/lfs/lfs.h Sat Jun 08 02:11:49 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs.h,v 1.143 2013/06/08 02:09:35 dholland Exp $       */
+/*     $NetBSD: lfs.h,v 1.144 2013/06/08 02:11:49 dholland Exp $       */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -271,6 +271,17 @@
 #define        LFS_DINODE1_SIZE        (sizeof(struct ulfs1_dinode))   /* 128 */
 #define        LFS_DINODE2_SIZE        (sizeof(struct ulfs2_dinode))
 
+/* File types, found in the upper bits of di_mode. */
+#define        LFS_IFMT        0170000         /* Mask of file type. */
+#define        LFS_IFIFO       0010000         /* Named pipe (fifo). */
+#define        LFS_IFCHR       0020000         /* Character device. */
+#define        LFS_IFDIR       0040000         /* Directory file. */
+#define        LFS_IFBLK       0060000         /* Block device. */
+#define        LFS_IFREG       0100000         /* Regular file. */
+#define        LFS_IFLNK       0120000         /* Symbolic link. */
+#define        LFS_IFSOCK      0140000         /* UNIX domain socket. */
+#define        LFS_IFWHT       0160000         /* Whiteout. */
+
 /*
  * "struct buf" associated definitions
  */
diff -r 1e3a61a300e1 -r 3af18cb19d36 sys/ufs/lfs/ulfs_dinode.h
--- a/sys/ufs/lfs/ulfs_dinode.h Sat Jun 08 02:11:11 2013 +0000
+++ b/sys/ufs/lfs/ulfs_dinode.h Sat Jun 08 02:11:49 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ulfs_dinode.h,v 1.6 2013/06/08 02:11:11 dholland Exp $ */
+/*     $NetBSD: ulfs_dinode.h,v 1.7 2013/06/08 02:11:49 dholland Exp $ */
 /*  from NetBSD: dinode.h,v 1.22 2013/01/22 09:39:18 dholland Exp  */
 
 /*
@@ -89,15 +89,4 @@
 #define        ISGID           0002000         /* Set-gid. */
 #define        ISUID           0004000         /* Set-uid. */
 
-/* File types. */
-#define        LFS_IFMT        0170000         /* Mask of file type. */
-#define        LFS_IFIFO       0010000         /* Named pipe (fifo). */
-#define        LFS_IFCHR       0020000         /* Character device. */
-#define        LFS_IFDIR       0040000         /* Directory file. */
-#define        LFS_IFBLK       0060000         /* Block device. */
-#define        LFS_IFREG       0100000         /* Regular file. */
-#define        LFS_IFLNK       0120000         /* Symbolic link. */
-#define        LFS_IFSOCK      0140000         /* UNIX domain socket. */
-#define        LFS_IFWHT       0160000         /* Whiteout. */
-
 #endif /* !_UFS_LFS_ULFS_DINODE_H_ */