Skip to content

Commit

Permalink
hfsplus: C99 comments clean-up
Browse files Browse the repository at this point in the history
Match coding style restriction against C99 comments where
checkpatch.pl reported errors about their usage.

Signed-off-by: Anton Salikhmetov <alexo@tuxera.com>
Signed-off-by: Christoph Hellwig <hch@tuxera.com>
  • Loading branch information
Anton Salikhmetov authored and Christoph Hellwig committed Dec 16, 2010
1 parent 2753cc2 commit 21f2296
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 13 deletions.
18 changes: 10 additions & 8 deletions fs/hfsplus/bnode.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ 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);
}

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;
}
Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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");
}
Expand Down Expand Up @@ -569,11 +569,13 @@ struct hfs_bnode *hfs_bnode_find(struct hfs_btree *tree, u32 num)

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);
}

Expand Down
2 changes: 1 addition & 1 deletion fs/hfsplus/extents.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
9 changes: 5 additions & 4 deletions fs/hfsplus/hfsplus_fs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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...) \
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 21f2296

Please sign in to comment.