aboutsummaryrefslogtreecommitdiffstats
path: root/fs/hfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-26 12:41:18 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-26 12:41:18 -0500
commit9ae21d1bb376436285cd5346d3e4b3655d6dd1b9 (patch)
tree8f889770fae721da63bd378c1834a87e2eb1cfb5 /fs/hfs
parentf9b4192923fa6e38331e88214b1fe5fc21583fcc (diff)
parente9415777b1cd0eaf4d1d3d61772f0e6d5c2551ad (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: drivers/char/ftape/lowlevel/fdc-io.c: Correct a comment Kconfig help: MTD_JEDECPROBE already supports Intel Remove ugly debugging stuff do_mounts.c: Minor ROOT_DEV comment cleanup BUG_ON() Conversion in drivers/s390/block/dasd_devmap.c BUG_ON() Conversion in mm/mempool.c BUG_ON() Conversion in mm/memory.c BUG_ON() Conversion in kernel/fork.c BUG_ON() Conversion in ipc/sem.c BUG_ON() Conversion in fs/ext2/ BUG_ON() Conversion in fs/hfs/ BUG_ON() Conversion in fs/dcache.c BUG_ON() Conversion in fs/buffer.c BUG_ON() Conversion in input/serio/hp_sdc_mlc.c BUG_ON() Conversion in md/dm-table.c BUG_ON() Conversion in md/dm-path-selector.c BUG_ON() Conversion in drivers/isdn BUG_ON() Conversion in drivers/char BUG_ON() Conversion in drivers/mtd/
Diffstat (limited to 'fs/hfs')
-rw-r--r--fs/hfs/bnode.c9
-rw-r--r--fs/hfs/btree.c3
2 files changed, 4 insertions, 8 deletions
diff --git a/fs/hfs/bnode.c b/fs/hfs/bnode.c
index a7a7d77f3fd3..1e44dcfe49c4 100644
--- a/fs/hfs/bnode.c
+++ b/fs/hfs/bnode.c
@@ -306,8 +306,7 @@ void hfs_bnode_unhash(struct hfs_bnode *node)
306 for (p = &node->tree->node_hash[hfs_bnode_hash(node->this)]; 306 for (p = &node->tree->node_hash[hfs_bnode_hash(node->this)];
307 *p && *p != node; p = &(*p)->next_hash) 307 *p && *p != node; p = &(*p)->next_hash)
308 ; 308 ;
309 if (!*p) 309 BUG_ON(!*p);
310 BUG();
311 *p = node->next_hash; 310 *p = node->next_hash;
312 node->tree->node_hash_cnt--; 311 node->tree->node_hash_cnt--;
313} 312}
@@ -415,8 +414,7 @@ struct hfs_bnode *hfs_bnode_create(struct hfs_btree *tree, u32 num)
415 spin_lock(&tree->hash_lock); 414 spin_lock(&tree->hash_lock);
416 node = hfs_bnode_findhash(tree, num); 415 node = hfs_bnode_findhash(tree, num);
417 spin_unlock(&tree->hash_lock); 416 spin_unlock(&tree->hash_lock);
418 if (node) 417 BUG_ON(node);
419 BUG();
420 node = __hfs_bnode_create(tree, num); 418 node = __hfs_bnode_create(tree, num);
421 if (!node) 419 if (!node)
422 return ERR_PTR(-ENOMEM); 420 return ERR_PTR(-ENOMEM);
@@ -459,8 +457,7 @@ void hfs_bnode_put(struct hfs_bnode *node)
459 457
460 dprint(DBG_BNODE_REFS, "put_node(%d:%d): %d\n", 458 dprint(DBG_BNODE_REFS, "put_node(%d:%d): %d\n",
461 node->tree->cnid, node->this, atomic_read(&node->refcnt)); 459 node->tree->cnid, node->this, atomic_read(&node->refcnt));
462 if (!atomic_read(&node->refcnt)) 460 BUG_ON(!atomic_read(&node->refcnt));
463 BUG();
464 if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock)) 461 if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock))
465 return; 462 return;
466 for (i = 0; i < tree->pages_per_bnode; i++) { 463 for (i = 0; i < tree->pages_per_bnode; i++) {
diff --git a/fs/hfs/btree.c b/fs/hfs/btree.c
index 7bb11edd1488..d20131ce4b95 100644
--- 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
36 tree->inode = iget_locked(sb, id); 36 tree->inode = iget_locked(sb, id);
37 if (!tree->inode) 37 if (!tree->inode)
38 goto free_tree; 38 goto free_tree;
39 if (!(tree->inode->i_state & I_NEW)) 39 BUG_ON(!(tree->inode->i_state & I_NEW));
40 BUG();
41 { 40 {
42 struct hfs_mdb *mdb = HFS_SB(sb)->mdb; 41 struct hfs_mdb *mdb = HFS_SB(sb)->mdb;
43 HFS_I(tree->inode)->flags = 0; 42 HFS_I(tree->inode)->flags = 0;