Module Name: src
Committed By: dholland
Date: Sat Jun 8 02:11:49 UTC 2013
Modified Files:
src/sys/ufs/lfs: lfs.h ulfs_dinode.h
Log Message:
Now move LFS_IFMT and friends from ulfs_dinode.h to lfs.h.
To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 src/sys/ufs/lfs/lfs.h
cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/lfs/ulfs_dinode.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.143 src/sys/ufs/lfs/lfs.h:1.144
--- src/sys/ufs/lfs/lfs.h:1.143 Sat Jun 8 02:09:35 2013
+++ src/sys/ufs/lfs/lfs.h Sat Jun 8 02:11:49 2013
@@ -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 @@ struct ulfs2_dinode {
#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
*/
Index: src/sys/ufs/lfs/ulfs_dinode.h
diff -u src/sys/ufs/lfs/ulfs_dinode.h:1.6 src/sys/ufs/lfs/ulfs_dinode.h:1.7
--- src/sys/ufs/lfs/ulfs_dinode.h:1.6 Sat Jun 8 02:11:11 2013
+++ src/sys/ufs/lfs/ulfs_dinode.h Sat Jun 8 02:11:49 2013
@@ -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_ */
