From cfe87f0076cfec9b92b7e1737f367be7cbf60d12 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Mon, 7 Jul 2014 23:21:07 +0000 Subject: [PATCH] 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. --- sys/fs/nandfs/nandfs.h | 6 +++--- sys/sys/buf.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/fs/nandfs/nandfs.h b/sys/fs/nandfs/nandfs.h index fd5978a1299..899a7dd7774 100644 --- a/sys/fs/nandfs/nandfs.h +++ b/sys/fs/nandfs/nandfs.h @@ -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_ */ diff --git a/sys/sys/buf.h b/sys/sys/buf.h index c384e187493..7185bff6472 100644 --- a/sys/sys/buf.h +++ b/sys/sys/buf.h @@ -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 */