projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename thread_info to stack
[powerpc.git]
/
fs
/
hfsplus
/
btree.c
diff --git
a/fs/hfsplus/btree.c
b/fs/hfsplus/btree.c
index
a67edfa
..
90ebab7
100644
(file)
--- a/
fs/hfsplus/btree.c
+++ b/
fs/hfsplus/btree.c
@@
-10,6
+10,7
@@
#include <linux/slab.h>
#include <linux/pagemap.h>
#include <linux/slab.h>
#include <linux/pagemap.h>
+#include <linux/log2.h>
#include "hfsplus_fs.h"
#include "hfsplus_raw.h"
#include "hfsplus_fs.h"
#include "hfsplus_raw.h"
@@
-24,10
+25,9
@@
struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id)
struct page *page;
unsigned int size;
struct page *page;
unsigned int size;
- tree = k
m
alloc(sizeof(*tree), GFP_KERNEL);
+ tree = k
z
alloc(sizeof(*tree), GFP_KERNEL);
if (!tree)
return NULL;
if (!tree)
return NULL;
- memset(tree, 0, sizeof(*tree));
init_MUTEX(&tree->tree_lock);
spin_lock_init(&tree->hash_lock);
init_MUTEX(&tree->tree_lock);
spin_lock_init(&tree->hash_lock);
@@
-38,7
+38,7
@@
struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id)
goto free_tree;
mapping = tree->inode->i_mapping;
goto free_tree;
mapping = tree->inode->i_mapping;
- page = read_
cache_page(mapping, 0, (filler_t *)mapping->a_ops->readpage
, NULL);
+ page = read_
mapping_page(mapping, 0
, NULL);
if (IS_ERR(page))
goto free_tree;
if (IS_ERR(page))
goto free_tree;
@@
-70,7
+70,7
@@
struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id)
}
size = tree->node_size;
}
size = tree->node_size;
- if (!
size || size & (size - 1
))
+ if (!
is_power_of_2(size
))
goto fail_page;
if (!tree->node_count)
goto fail_page;
goto fail_page;
if (!tree->node_count)
goto fail_page;
@@
-269,8
+269,7
@@
void hfs_bmap_free(struct hfs_bnode *node)
u8 *data, byte, m;
dprint(DBG_BNODE_MOD, "btree_free_node: %u\n", node->this);
u8 *data, byte, m;
dprint(DBG_BNODE_MOD, "btree_free_node: %u\n", node->this);
- if (!node->this)
- BUG();
+ BUG_ON(!node->this);
tree = node->tree;
nidx = node->this;
node = hfs_bnode_find(tree, 0);
tree = node->tree;
nidx = node->this;
node = hfs_bnode_find(tree, 0);