diff options
| author | imp <imp@FreeBSD.org> | 2014-07-07 23:21:07 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2014-07-07 23:21:07 +0000 |
| commit | bffc4efe0b135cc9f6aa3acf917b5e69ddfa4141 (patch) | |
| tree | 47a6e12c6903f3f665d9fefcb7e52decdf0be5d6 | |
| parent | 9f3ff514cae98d426eab3ea87e58ca11f61a53f0 (diff) | |
| download | FreeBSD-src-bffc4efe0b135cc9f6aa3acf917b5e69ddfa4141.zip FreeBSD-src-bffc4efe0b135cc9f6aa3acf917b5e69ddfa4141.tar.gz | |
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.
| -rw-r--r-- | sys/fs/nandfs/nandfs.h | 6 | ||||
| -rw-r--r-- | 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 fd5978a..899a7dd 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 c384e18..7185bff 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 */ |
