Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus

[pandora-kernel.git] / fs / hfsplus / hfsplus_fs.h

diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h
index c4abec1..d685752 100644 (file)
--- a/fs/hfsplus/hfsplus_fs.h
+++ b/fs/hfsplus/hfsplus_fs.h
@@ -23,13 +23,16 @@
 #define DBG_EXTENT     0x00000020
 #define DBG_BITMAP     0x00000040
 
-//#define DBG_MASK     (DBG_EXTENT|DBG_INODE|DBG_BNODE_MOD)
-//#define DBG_MASK     (DBG_BNODE_MOD|DBG_CAT_MOD|DBG_INODE)
-//#define DBG_MASK     (DBG_CAT_MOD|DBG_BNODE_REFS|DBG_INODE|DBG_EXTENT)
+#if 0
+#define DBG_MASK       (DBG_EXTENT|DBG_INODE|DBG_BNODE_MOD)
+#define DBG_MASK       (DBG_BNODE_MOD|DBG_CAT_MOD|DBG_INODE)
+#define DBG_MASK       (DBG_CAT_MOD|DBG_BNODE_REFS|DBG_INODE|DBG_EXTENT)
+#endif
 #define DBG_MASK       (0)
 
 #define dprint(flg, fmt, args...) \
-       if (flg & DBG_MASK) printk(fmt , ## args)
+       if (flg & DBG_MASK) \
+               printk(fmt , ## args)
 
 /* Runtime config options */
 #define HFSPLUS_DEF_CR_TYPE    0x3F3F3F3F  /* '????' */
@@ -62,7 +65,6 @@ struct hfs_btree {
        unsigned int max_key_len;
        unsigned int depth;
 
-       //unsigned int map1_size, map_size;
        struct mutex tree_lock;
 
        unsigned int pages_per_bnode;
@@ -424,9 +426,12 @@ int hfsplus_uni2asc(struct super_block *,
                const struct hfsplus_unistr *, char *, int *);
 int hfsplus_asc2uni(struct super_block *,
                struct hfsplus_unistr *, const char *, int);
-int hfsplus_hash_dentry(struct dentry *dentry, struct qstr *str);
-int hfsplus_compare_dentry(struct dentry *dentry,
-               struct qstr *s1, struct qstr *s2);
+int hfsplus_hash_dentry(const struct dentry *dentry,
+               const struct inode *inode, struct qstr *str);
+int hfsplus_compare_dentry(const struct dentry *parent,
+               const struct inode *pinode,
+               const struct dentry *dentry, const struct inode *inode,
+               unsigned int len, const char *str, const struct qstr *name);
 
 /* wrapper.c */
 int hfsplus_read_wrapper(struct super_block *);