Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fs/hfs/btree.h: remove duplicate defines

This patch removes duplicate defines from fs/hfs/btree.h

[akpm@linux-foundation.org: retain the comments]
Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Reviewed-by: Vyacheslav Dubeyko <slava@dubeyko.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Michael Opdenacker and committed by
Linus Torvalds
74a797d9 b4506261

+4 -9
-5
fs/hfs/btree.h
··· 153 153 u32 reserved3[16]; 154 154 } __packed; 155 155 156 - #define HFS_NODE_INDEX 0x00 /* An internal (index) node */ 157 - #define HFS_NODE_HEADER 0x01 /* The tree header node (node 0) */ 158 - #define HFS_NODE_MAP 0x02 /* Holds part of the bitmap of used nodes */ 159 - #define HFS_NODE_LEAF 0xFF /* A leaf (ndNHeight==1) node */ 160 - 161 156 #define BTREE_ATTR_BADCLOSE 0x00000001 /* b-tree not closed properly. not 162 157 used by hfsplus. */ 163 158 #define HFS_TREE_BIGKEYS 0x00000002 /* key length is u16 instead of u8.
+4 -4
fs/hfsplus/hfsplus_raw.h
··· 156 156 } __packed; 157 157 158 158 /* HFS+ BTree node types */ 159 - #define HFS_NODE_INDEX 0x00 160 - #define HFS_NODE_HEADER 0x01 161 - #define HFS_NODE_MAP 0x02 162 - #define HFS_NODE_LEAF 0xFF 159 + #define HFS_NODE_INDEX 0x00 /* An internal (index) node */ 160 + #define HFS_NODE_HEADER 0x01 /* The tree header node (node 0) */ 161 + #define HFS_NODE_MAP 0x02 /* Holds part of the bitmap of used nodes */ 162 + #define HFS_NODE_LEAF 0xFF /* A leaf (ndNHeight==1) node */ 163 163 164 164 /* HFS+ BTree header */ 165 165 struct hfs_btree_header_rec {