diff options
author | Anton Salikhmetov <alexo@tuxera.com> | 2010-12-16 11:08:38 -0500 |
---|---|---|
committer | Christoph Hellwig <hch@tuxera.com> | 2010-12-16 12:08:45 -0500 |
commit | 2753cc281c9a0e8a0a45ee2b8110866a9fe63bdd (patch) | |
tree | d28794ef990637cfcd734a8b467f119e6d69dac1 /fs/hfsplus/btree.c | |
parent | 596276c3571e2108f4b336be545ece2eacf3da59 (diff) |
hfsplus: over 80 character lines clean-up
Match coding style line length limitation where checkpatch.pl
reported over-80-character-line warnings.
Signed-off-by: Anton Salikhmetov <alexo@tuxera.com>
Signed-off-by: Christoph Hellwig <hch@tuxera.com>
Diffstat (limited to 'fs/hfsplus/btree.c')
-rw-r--r-- | fs/hfsplus/btree.c | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/fs/hfsplus/btree.c b/fs/hfsplus/btree.c index 97556f932d57..21023d9f8ff3 100644 --- a/fs/hfsplus/btree.c +++ b/fs/hfsplus/btree.c | |||
@@ -51,7 +51,8 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id) | |||
51 | goto free_inode; | 51 | goto free_inode; |
52 | 52 | ||
53 | /* Load the header */ | 53 | /* Load the header */ |
54 | head = (struct hfs_btree_header_rec *)(kmap(page) + sizeof(struct hfs_bnode_desc)); | 54 | head = (struct hfs_btree_header_rec *)(kmap(page) + |
55 | sizeof(struct hfs_bnode_desc)); | ||
55 | tree->root = be32_to_cpu(head->root); | 56 | tree->root = be32_to_cpu(head->root); |
56 | tree->leaf_count = be32_to_cpu(head->leaf_count); | 57 | tree->leaf_count = be32_to_cpu(head->leaf_count); |
57 | tree->leaf_head = be32_to_cpu(head->leaf_head); | 58 | tree->leaf_head = be32_to_cpu(head->leaf_head); |
@@ -115,7 +116,9 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id) | |||
115 | 116 | ||
116 | tree->node_size_shift = ffs(size) - 1; | 117 | tree->node_size_shift = ffs(size) - 1; |
117 | 118 | ||
118 | tree->pages_per_bnode = (tree->node_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; | 119 | tree->pages_per_bnode = |
120 | (tree->node_size + PAGE_CACHE_SIZE - 1) >> | ||
121 | PAGE_CACHE_SHIFT; | ||
119 | 122 | ||
120 | kunmap(page); | 123 | kunmap(page); |
121 | page_cache_release(page); | 124 | page_cache_release(page); |
@@ -144,8 +147,10 @@ void hfs_btree_close(struct hfs_btree *tree) | |||
144 | while ((node = tree->node_hash[i])) { | 147 | while ((node = tree->node_hash[i])) { |
145 | tree->node_hash[i] = node->next_hash; | 148 | tree->node_hash[i] = node->next_hash; |
146 | if (atomic_read(&node->refcnt)) | 149 | if (atomic_read(&node->refcnt)) |
147 | printk(KERN_CRIT "hfs: node %d:%d still has %d user(s)!\n", | 150 | printk(KERN_CRIT "hfs: node %d:%d " |
148 | node->tree->cnid, node->this, atomic_read(&node->refcnt)); | 151 | "still has %d user(s)!\n", |
152 | node->tree->cnid, node->this, | ||
153 | atomic_read(&node->refcnt)); | ||
149 | hfs_bnode_free(node); | 154 | hfs_bnode_free(node); |
150 | tree->node_hash_cnt--; | 155 | tree->node_hash_cnt--; |
151 | } | 156 | } |
@@ -166,7 +171,8 @@ void hfs_btree_write(struct hfs_btree *tree) | |||
166 | return; | 171 | return; |
167 | /* Load the header */ | 172 | /* Load the header */ |
168 | page = node->page[0]; | 173 | page = node->page[0]; |
169 | head = (struct hfs_btree_header_rec *)(kmap(page) + sizeof(struct hfs_bnode_desc)); | 174 | head = (struct hfs_btree_header_rec *)(kmap(page) + |
175 | sizeof(struct hfs_bnode_desc)); | ||
170 | 176 | ||
171 | head->root = cpu_to_be32(tree->root); | 177 | head->root = cpu_to_be32(tree->root); |
172 | head->leaf_count = cpu_to_be32(tree->leaf_count); | 178 | head->leaf_count = cpu_to_be32(tree->leaf_count); |
@@ -272,7 +278,8 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree) | |||
272 | tree->free_nodes--; | 278 | tree->free_nodes--; |
273 | mark_inode_dirty(tree->inode); | 279 | mark_inode_dirty(tree->inode); |
274 | hfs_bnode_put(node); | 280 | hfs_bnode_put(node); |
275 | return hfs_bnode_create(tree, idx); | 281 | return hfs_bnode_create(tree, |
282 | idx); | ||
276 | } | 283 | } |
277 | } | 284 | } |
278 | } | 285 | } |
@@ -329,7 +336,9 @@ void hfs_bmap_free(struct hfs_bnode *node) | |||
329 | hfs_bnode_put(node); | 336 | hfs_bnode_put(node); |
330 | if (!i) { | 337 | if (!i) { |
331 | /* panic */; | 338 | /* panic */; |
332 | printk(KERN_CRIT "hfs: unable to free bnode %u. bmap not found!\n", node->this); | 339 | printk(KERN_CRIT "hfs: unable to free bnode %u. " |
340 | "bmap not found!\n", | ||
341 | node->this); | ||
333 | return; | 342 | return; |
334 | } | 343 | } |
335 | node = hfs_bnode_find(tree, i); | 344 | node = hfs_bnode_find(tree, i); |
@@ -337,7 +346,9 @@ void hfs_bmap_free(struct hfs_bnode *node) | |||
337 | return; | 346 | return; |
338 | if (node->type != HFS_NODE_MAP) { | 347 | if (node->type != HFS_NODE_MAP) { |
339 | /* panic */; | 348 | /* panic */; |
340 | printk(KERN_CRIT "hfs: invalid bmap found! (%u,%d)\n", node->this, node->type); | 349 | printk(KERN_CRIT "hfs: invalid bmap found! " |
350 | "(%u,%d)\n", | ||
351 | node->this, node->type); | ||
341 | hfs_bnode_put(node); | 352 | hfs_bnode_put(node); |
342 | return; | 353 | return; |
343 | } | 354 | } |
@@ -350,7 +361,9 @@ void hfs_bmap_free(struct hfs_bnode *node) | |||
350 | m = 1 << (~nidx & 7); | 361 | m = 1 << (~nidx & 7); |
351 | byte = data[off]; | 362 | byte = data[off]; |
352 | if (!(byte & m)) { | 363 | if (!(byte & m)) { |
353 | printk(KERN_CRIT "hfs: trying to free free bnode %u(%d)\n", node->this, node->type); | 364 | printk(KERN_CRIT "hfs: trying to free free bnode " |
365 | "%u(%d)\n", | ||
366 | node->this, node->type); | ||
354 | kunmap(page); | 367 | kunmap(page); |
355 | hfs_bnode_put(node); | 368 | hfs_bnode_put(node); |
356 | return; | 369 | return; |