Module Name: src
Committed By: dholland
Date: Mon May 26 18:52:50 UTC 2014
Modified Files:
src/sys/ufs/chfs: chfs_inode.h
src/sys/ufs/ufs: inode.h
Log Message:
Remove lfs-only inode flags.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/ufs/chfs/chfs_inode.h
cvs rdiff -u -r1.68 -r1.69 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.7 src/sys/ufs/chfs/chfs_inode.h:1.8
--- src/sys/ufs/chfs/chfs_inode.h:1.7 Tue Jan 22 09:39:15 2013
+++ src/sys/ufs/chfs/chfs_inode.h Mon May 26 18:52:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_inode.h,v 1.7 2013/01/22 09:39:15 dholland Exp $ */
+/* $NetBSD: chfs_inode.h,v 1.8 2014/05/26 18:52:50 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. */
-#define IN_RENAME 0x0020 /* Inode is being renamed. */
+/* unused 0x0020 /* was IN_RENAME */
#define IN_SHLOCK 0x0040 /* File has shared lock. */
#define IN_EXLOCK 0x0080 /* File has exclusive lock. */
-#define IN_CLEANING 0x0100 /* LFS: file is being cleaned */
-#define IN_ADIROP 0x0200 /* LFS: dirop in progress */
+/* 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. */
-#define IN_PAGING 0x1000 /* LFS: file is on paging queue */
+/* 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.68 src/sys/ufs/ufs/inode.h:1.69
--- src/sys/ufs/ufs/inode.h:1.68 Sat May 17 19:11:40 2014
+++ src/sys/ufs/ufs/inode.h Mon May 26 18:52:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: inode.h,v 1.68 2014/05/17 19:11:40 martin Exp $ */
+/* $NetBSD: inode.h,v 1.69 2014/05/26 18:52:50 dholland Exp $ */
/*
* Copyright (c) 1982, 1989, 1993
@@ -238,14 +238,14 @@ struct 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. */
-/* #define IN_UNUSED 0x0020 */ /* unused, was IN_RENAME */
+/* unused 0x0020 */ /* was IN_RENAME */
#define IN_SHLOCK 0x0040 /* File has shared lock. */
#define IN_EXLOCK 0x0080 /* File has exclusive lock. */
-#define IN_CLEANING 0x0100 /* LFS: file is being cleaned */
-#define IN_ADIROP 0x0200 /* LFS: dirop in progress */
+#define 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. */
-#define IN_PAGING 0x1000 /* LFS: file is on paging queue */
-#define IN_CDIROP 0x4000 /* LFS: dirop completed pending i/o */
+/* unused 0x1000 /* was LFS-only IN_PAGING */
+/* unused 0x4000 /* was LFS-only IN_CDIROP */
#if defined(_KERNEL)
/*
