svn commit: r268374 - in head/sys: fs/nandfs sys

[Warner Losh]

Author: imp
Date: Mon Jul  7 23:21:07 2014
New Revision: 268374
URL: http://svnweb.freebsd.org/changeset/base/268374

Log:
  Naughty NANDFS was using hidden unused flag, hiding the fact that the
  flag was used and wasn't really available. Change the name without
  fixing any laying issues that might be present in NANDFS' use of this
  flag.

Modified:
  head/sys/fs/nandfs/nandfs.h
  head/sys/sys/buf.h

Modified: head/sys/fs/nandfs/nandfs.h
==============================================================================
--- head/sys/fs/nandfs/nandfs.h	Mon Jul  7 22:02:39 2014	(r268373)
+++ head/sys/fs/nandfs/nandfs.h	Mon Jul  7 23:21:07 2014	(r268374)
@@ -303,8 +303,8 @@ struct nandfs_node {
 #define	PRINT_NODE_FLAGS \
 	"\10\1IN_ACCESS\2IN_CHANGE\3IN_UPDATE\4IN_MODIFIED\5IN_RENAME"
 
-#define	NANDFS_GATHER(x) ((x)->b_flags |= B_00800000)
-#define	NANDFS_UNGATHER(x) ((x)->b_flags &= ~B_00800000)
-#define	NANDFS_ISGATHERED(x) ((x)->b_flags & B_00800000)
+#define	NANDFS_GATHER(x) ((x)->b_flags |= B_FS_FLAG1)
+#define	NANDFS_UNGATHER(x) ((x)->b_flags &= ~B_FS_FLAG1)
+#define	NANDFS_ISGATHERED(x) ((x)->b_flags & B_FS_FLAG1)
 
 #endif /* !_FS_NANDFS_NANDFS_H_ */

Modified: head/sys/sys/buf.h
==============================================================================
--- head/sys/sys/buf.h	Mon Jul  7 22:02:39 2014	(r268373)
+++ head/sys/sys/buf.h	Mon Jul  7 23:21:07 2014	(r268374)
@@ -213,7 +213,7 @@ struct buf {
 #define	B_00100000	0x00100000	/* Available flag. */
 #define	B_DIRTY		0x00200000	/* Needs writing later (in EXT2FS). */
 #define	B_RELBUF	0x00400000	/* Release VMIO buffer. */
-#define	B_00800000	0x00800000	/* Available flag. */
+#define	B_FS_FLAG1	0x00800000	/* Available flag for FS use. */
 #define	B_NOCOPY	0x01000000	/* Don't copy-on-write this buf. */
 #define	B_INFREECNT	0x02000000	/* buf is counted in numfreebufs */
 #define	B_PAGING	0x04000000	/* volatile paging I/O -- bypass VMIO */