diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 17:10:34 -0400 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 17:10:34 -0400 |
| commit | 12df7556705aae97f24a397377e17898700d7192 (patch) | |
| tree | 5adc6b1c2aa940263ee2e88fc6645918533da539 /fs/hfsplus/btree.c | |
| parent | 34ddf733c415a8e336c996a4303d9f336e0c81b5 (diff) | |
| parent | 6246b6128bbe34d0752f119cf7c5111c85fe481d (diff) | |
Merge branch 'master'
Diffstat (limited to 'fs/hfsplus/btree.c')
| -rw-r--r-- | fs/hfsplus/btree.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/hfsplus/btree.c b/fs/hfsplus/btree.c index a67edfa34e9e..effa8991999c 100644 --- a/fs/hfsplus/btree.c +++ b/fs/hfsplus/btree.c | |||
| @@ -269,8 +269,7 @@ void hfs_bmap_free(struct hfs_bnode *node) | |||
| 269 | u8 *data, byte, m; | 269 | u8 *data, byte, m; |
| 270 | 270 | ||
| 271 | dprint(DBG_BNODE_MOD, "btree_free_node: %u\n", node->this); | 271 | dprint(DBG_BNODE_MOD, "btree_free_node: %u\n", node->this); |
| 272 | if (!node->this) | 272 | BUG_ON(!node->this); |
| 273 | BUG(); | ||
| 274 | tree = node->tree; | 273 | tree = node->tree; |
| 275 | nidx = node->this; | 274 | nidx = node->this; |
| 276 | node = hfs_bnode_find(tree, 0); | 275 | node = hfs_bnode_find(tree, 0); |