git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
fs
/
hfs
/
btree.c
diff --git
a/fs/hfs/btree.c
b/fs/hfs/btree.c
index
19f10cf
..
d20131c
100644
(file)
--- a/
fs/hfs/btree.c
+++ b/
fs/hfs/btree.c
@@
-36,8
+36,7
@@
struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke
tree->inode = iget_locked(sb, id);
if (!tree->inode)
goto free_tree;
tree->inode = iget_locked(sb, id);
if (!tree->inode)
goto free_tree;
- if (!(tree->inode->i_state & I_NEW))
- BUG();
+ BUG_ON(!(tree->inode->i_state & I_NEW));
{
struct hfs_mdb *mdb = HFS_SB(sb)->mdb;
HFS_I(tree->inode)->flags = 0;
{
struct hfs_mdb *mdb = HFS_SB(sb)->mdb;
HFS_I(tree->inode)->flags = 0;
@@
-111,7
+110,7
@@
void hfs_btree_close(struct hfs_btree *tree)
while ((node = tree->node_hash[i])) {
tree->node_hash[i] = node->next_hash;
if (atomic_read(&node->refcnt))
while ((node = tree->node_hash[i])) {
tree->node_hash[i] = node->next_hash;
if (atomic_read(&node->refcnt))
- printk(
"HFS
: node %d:%d still has %d user(s)!\n",
+ printk(
KERN_ERR "hfs
: node %d:%d still has %d user(s)!\n",
node->tree->cnid, node->this, atomic_read(&node->refcnt));
hfs_bnode_free(node);
tree->node_hash_cnt--;
node->tree->cnid, node->this, atomic_read(&node->refcnt));
hfs_bnode_free(node);
tree->node_hash_cnt--;
@@
-154,7
+153,7
@@
static struct hfs_bnode *hfs_bmap_new_bmap(struct hfs_bnode *prev, u32 idx)
struct hfs_btree *tree = prev->tree;
struct hfs_bnode *node;
struct hfs_bnode_desc desc;
struct hfs_btree *tree = prev->tree;
struct hfs_bnode *node;
struct hfs_bnode_desc desc;
-
u
32 cnid;
+
__be
32 cnid;
node = hfs_bnode_create(tree, idx);
if (IS_ERR(node))
node = hfs_bnode_create(tree, idx);
if (IS_ERR(node))
@@
-201,10
+200,12
@@
struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree)
res = hfs_extend_file(inode);
if (res)
return ERR_PTR(res);
res = hfs_extend_file(inode);
if (res)
return ERR_PTR(res);
- inode->i_blocks = HFS_I(inode)->alloc_blocks *
- HFS_SB(tree->sb)->fs_div;
HFS_I(inode)->phys_size = inode->i_size =
HFS_I(inode)->phys_size = inode->i_size =
- (loff_t)inode->i_blocks << tree->sb->s_blocksize_bits;
+ (loff_t)HFS_I(inode)->alloc_blocks *
+ HFS_SB(tree->sb)->alloc_blksz;
+ HFS_I(inode)->fs_blocks = inode->i_size >>
+ tree->sb->s_blocksize_bits;
+ inode_set_bytes(inode, inode->i_size);
count = inode->i_size >> tree->node_size_shift;
tree->free_nodes = count - tree->node_count;
tree->node_count = count;
count = inode->i_size >> tree->node_size_shift;
tree->free_nodes = count - tree->node_count;
tree->node_count = count;
@@
-250,7
+251,7
@@
struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree)
kunmap(*pagep);
nidx = node->next;
if (!nidx) {
kunmap(*pagep);
nidx = node->next;
if (!nidx) {
- printk(
"
create new bmap node...\n");
+ printk(
KERN_DEBUG "hfs:
create new bmap node...\n");
next_node = hfs_bmap_new_bmap(node, idx);
} else
next_node = hfs_bnode_find(tree, nidx);
next_node = hfs_bmap_new_bmap(node, idx);
} else
next_node = hfs_bnode_find(tree, nidx);
@@
-290,7
+291,7
@@
void hfs_bmap_free(struct hfs_bnode *node)
hfs_bnode_put(node);
if (!i) {
/* panic */;
hfs_bnode_put(node);
if (!i) {
/* panic */;
- printk(
"HFS
: unable to free bnode %u. bmap not found!\n", node->this);
+ printk(
KERN_CRIT "hfs
: unable to free bnode %u. bmap not found!\n", node->this);
return;
}
node = hfs_bnode_find(tree, i);
return;
}
node = hfs_bnode_find(tree, i);
@@
-298,7
+299,7
@@
void hfs_bmap_free(struct hfs_bnode *node)
return;
if (node->type != HFS_NODE_MAP) {
/* panic */;
return;
if (node->type != HFS_NODE_MAP) {
/* panic */;
- printk(
"HFS
: invalid bmap found! (%u,%d)\n", node->this, node->type);
+ printk(
KERN_CRIT "hfs
: invalid bmap found! (%u,%d)\n", node->this, node->type);
hfs_bnode_put(node);
return;
}
hfs_bnode_put(node);
return;
}
@@
-311,7
+312,7
@@
void hfs_bmap_free(struct hfs_bnode *node)
m = 1 << (~nidx & 7);
byte = data[off];
if (!(byte & m)) {
m = 1 << (~nidx & 7);
byte = data[off];
if (!(byte & m)) {
- printk(
"HFS
: trying to free free bnode %u(%d)\n", node->this, node->type);
+ printk(
KERN_CRIT "hfs
: trying to free free bnode %u(%d)\n", node->this, node->type);
kunmap(page);
hfs_bnode_put(node);
return;
kunmap(page);
hfs_bnode_put(node);
return;