Module Name: src
Committed By: dholland
Date: Mon May 26 19:16:39 UTC 2014
Modified Files:
src/sys/ufs/chfs: chfs_inode.h
src/sys/ufs/ufs: inode.h
Log Message:
Fix previous. Anyone have a brown paper bag?
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/ufs/chfs/chfs_inode.h
cvs rdiff -u -r1.70 -r1.71 src/sys/ufs/ufs/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/chfs/chfs_inode.h
diff -u src/sys/ufs/chfs/chfs_inode.h:1.8 src/sys/ufs/chfs/chfs_inode.h:1.9
--- src/sys/ufs/chfs/chfs_inode.h:1.8 Mon May 26 18:52:50 2014
+++ src/sys/ufs/chfs/chfs_inode.h Mon May 26 19:16:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_inode.h,v 1.8 2014/05/26 18:52:50 dholland Exp $ */
+/* $NetBSD: chfs_inode.h,v 1.9 2014/05/26 19:16:39 dholland Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -121,13 +121,13 @@ struct chfs_inode
#define IN_MODIFY 0x2000 /* Modification time update request. */
#define IN_MODIFIED 0x0008 /* Inode has been modified. */
#define IN_ACCESSED 0x0010 /* Inode has been accessed. */
-/* unused 0x0020 /* was IN_RENAME */
+/* unused 0x0020 */ /* was IN_RENAME */
#define IN_SHLOCK 0x0040 /* File has shared lock. */
#define IN_EXLOCK 0x0080 /* File has exclusive lock. */
-/* unused 0x0100 /* was LFS-only IN_CLEANING */
-/* unused 0x0200 /* was LFS-only IN_ADIROP */
+/* unused 0x0100 */ /* was LFS-only IN_CLEANING */
+/* unused 0x0200 */ /* was LFS-only IN_ADIROP */
#define IN_SPACECOUNTED 0x0400 /* Blocks to be freed in free count. */
-/* unused 0x1000 /* was LFS-only IN_PAGING */
+/* unused 0x1000 */ /* was LFS-only IN_PAGING */
#ifdef VTOI
Index: src/sys/ufs/ufs/inode.h
diff -u src/sys/ufs/ufs/inode.h:1.70 src/sys/ufs/ufs/inode.h:1.71
--- src/sys/ufs/ufs/inode.h:1.70 Mon May 26 19:12:43 2014
+++ src/sys/ufs/ufs/inode.h Mon May 26 19:16:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: inode.h,v 1.70 2014/05/26 19:12:43 ryoon Exp $ */
+/* $NetBSD: inode.h,v 1.71 2014/05/26 19:16:39 dholland Exp $ */
/*
* Copyright (c) 1982, 1989, 1993
@@ -241,11 +241,11 @@ struct inode {
/* unused 0x0020 */ /* was IN_RENAME */
#define IN_SHLOCK 0x0040 /* File has shared lock. */
#define IN_EXLOCK 0x0080 /* File has exclusive lock. */
-#define unused 0x0100 /* was LFS-only IN_CLEANING */
+/* unused 0x0100 */ /* was LFS-only IN_CLEANING */
/* unused 0x0200 */ /* was LFS-only IN_ADIROP */
#define IN_SPACECOUNTED 0x0400 /* Blocks to be freed in free count. */
/* unused 0x1000 */ /* was LFS-only IN_PAGING */
-/* unused 0x4000 */ /* was LFS-only IN_CDIROP */
+/* unused 0x4000 */ /* was LFS-only IN_CDIROP */
#if defined(_KERNEL)
/*
