Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[~andy/linux] / fs / hfsplus / hfsplus_raw.h

diff --git a/fs/hfsplus/hfsplus_raw.h b/fs/hfsplus/hfsplus_raw.h
index 452ede01b036c4de551e2cb9a723855bf066070b..8ffb3a8ffe75b9d6374cb9198d83d5dce5553457 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 {
@@ -187,6 +187,9 @@ struct hfs_btree_header_rec {
 /* HFS+ BTree misc info */
 #define HFSPLUS_TREE_HEAD 0
 #define HFSPLUS_NODE_MXSZ 32768
+#define HFSPLUS_ATTR_TREE_NODE_SIZE            8192
+#define HFSPLUS_BTREE_HDR_NODE_RECS_COUNT      3
+#define HFSPLUS_BTREE_HDR_USER_BYTES           128
 
 /* Some special File ID numbers (stolen from hfs.h) */
 #define HFSPLUS_POR_CNID               1       /* Parent Of the Root */