3 files changed, 16 insertions, 13 deletions

diff --git a/fs/hfsplus/bnode.c b/fs/hfsplus/bnode.c
index cf7dc8dac76..c8f4ea4bb5e 100644
--- a/fs/hfsplus/bnode.c
+++ b/fs/hfsplus/bnode.c
@@ -42,7 +42,7 @@ void hfs_bnode_read(struct hfs_bnode *node, void *buf, int off, int len)
 u16 hfs_bnode_read_u16(struct hfs_bnode *node, int off)
 {
         __be16 data;
-        // optimize later...
+        /* TODO: optimize later... */
         hfs_bnode_read(node, &data, off, 2);
         return be16_to_cpu(data);
 }
@@ -50,7 +50,7 @@ u16 hfs_bnode_read_u16(struct hfs_bnode *node, int off)
 u8 hfs_bnode_read_u8(struct hfs_bnode *node, int off)
 {
         u8 data;
-        // optimize later...
+        /* TODO: optimize later... */
         hfs_bnode_read(node, &data, off, 1);
         return data;
 }
@@ -96,7 +96,7 @@ void hfs_bnode_write(struct hfs_bnode *node, void *buf, int off, int len)
 void hfs_bnode_write_u16(struct hfs_bnode *node, int off, u16 data)
 {
         __be16 v = cpu_to_be16(data);
-        // optimize later...
+        /* TODO: optimize later... */
         hfs_bnode_write(node, &v, off, 2);
 }
 
@@ -362,7 +362,7 @@ void hfs_bnode_unlink(struct hfs_bnode *node)
         } else if (node->type == HFS_NODE_LEAF)
                 tree->leaf_tail = node->prev;
 
-        // move down?
+        /* move down? */
         if (!node->prev && !node->next) {
                 dprint(DBG_BNODE_MOD, "hfs_btree_del_level\n");
         }
@@ -569,11 +569,13 @@ node_error:
 
 void hfs_bnode_free(struct hfs_bnode *node)
 {
-        //int i;
+#if 0
+        int i;
 
-        //for (i = 0; i < node->tree->pages_per_bnode; i++)
-        //      if (node->page[i])
-        //              page_cache_release(node->page[i]);
+        for (i = 0; i < node->tree->pages_per_bnode; i++)
+                if (node->page[i])
+                        page_cache_release(node->page[i]);
+#endif
         kfree(node);
 }
 
diff --git a/fs/hfsplus/extents.c b/fs/hfsplus/extents.c
index 1ae2fe5cfa7..4b693b5b623 100644
--- a/fs/hfsplus/extents.c
+++ b/fs/hfsplus/extents.c
@@ -399,7 +399,7 @@ int hfsplus_file_extend(struct inode *inode)
 
         if (sbi->alloc_file->i_size * 8 <
             sbi->total_blocks - sbi->free_blocks + 8) {
-                // extend alloc file
+                /* extend alloc file */
                 printk(KERN_ERR "hfs: extend alloc file! (%Lu,%u,%u)\n",
                                 sbi->alloc_file->i_size * 8,
                                 sbi->total_blocks, sbi->free_blocks);
diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h
index c4abec16782..a15e1c11e82 100644
--- a/fs/hfsplus/hfsplus_fs.h
+++ b/fs/hfsplus/hfsplus_fs.h
@@ -23,9 +23,11 @@
 #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...) \
@@ -62,7 +64,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;