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>

diff --git a/fs/hfs/btree.h b/fs/hfs/btree.h
index 2a1d712f85dccfb5bb2983615e84278a1c4923e7..f6bd266d70b55d8273fcffc362f347c336237ae1 100644 (file)
--- a/fs/hfs/btree.h
+++ b/fs/hfs/btree.h
@@ -153,11 +153,6 @@ struct hfs_btree_header_rec {
        u32 reserved3[16];
 } __packed;
 
-#define HFS_NODE_INDEX 0x00    /* An internal (index) node */
-#define HFS_NODE_HEADER        0x01    /* The tree header node (node 0) */
-#define HFS_NODE_MAP           0x02    /* Holds part of the bitmap of used nodes */
-#define HFS_NODE_LEAF          0xFF    /* A leaf (ndNHeight==1) node */
-
 #define BTREE_ATTR_BADCLOSE    0x00000001      /* b-tree not closed properly. not
                                                   used by hfsplus. */
 #define HFS_TREE_BIGKEYS       0x00000002      /* key length is u16 instead of u8.

diff --git a/fs/hfsplus/hfsplus_raw.h b/fs/hfsplus/hfsplus_raw.h
index 452ede01b036c4de551e2cb9a723855bf066070b..2c54dd81def4dc4bb04ab77fb6844ba0e71426b0 100644 (file)
--- a/fs/hfsplus/hfsplus_raw.h
+++ b/fs/hfsplus/hfsplus_raw.h
@@ -156,10 +156,10 @@ struct hfs_bnode_desc {
 } __packed;
 
 /* HFS+ BTree node types */
-#define HFS_NODE_INDEX 0x00
-#define HFS_NODE_HEADER        0x01
-#define HFS_NODE_MAP   0x02
-#define HFS_NODE_LEAF  0xFF
+#define HFS_NODE_INDEX 0x00    /* An internal (index) node */
+#define HFS_NODE_HEADER        0x01    /* The tree header node (node 0) */
+#define HFS_NODE_MAP   0x02    /* Holds part of the bitmap of used nodes */
+#define HFS_NODE_LEAF  0xFF    /* A leaf (ndNHeight==1) node */
 
 /* HFS+ BTree header */
 struct hfs_btree_header_rec {