diff options
Diffstat (limited to 'fs/hfs/bnode.c')
| -rw-r--r-- | fs/hfs/bnode.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/fs/hfs/bnode.c b/fs/hfs/bnode.c index a096c5a56664..3d5cdc6847c0 100644 --- a/fs/hfs/bnode.c +++ b/fs/hfs/bnode.c | |||
| @@ -13,8 +13,6 @@ | |||
| 13 | 13 | ||
| 14 | #include "btree.h" | 14 | #include "btree.h" |
| 15 | 15 | ||
| 16 | #define REF_PAGES 0 | ||
| 17 | |||
| 18 | void hfs_bnode_read(struct hfs_bnode *node, void *buf, | 16 | void hfs_bnode_read(struct hfs_bnode *node, void *buf, |
| 19 | int off, int len) | 17 | int off, int len) |
| 20 | { | 18 | { |
| @@ -289,9 +287,7 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid) | |||
| 289 | page_cache_release(page); | 287 | page_cache_release(page); |
| 290 | goto fail; | 288 | goto fail; |
| 291 | } | 289 | } |
| 292 | #if !REF_PAGES | ||
| 293 | page_cache_release(page); | 290 | page_cache_release(page); |
| 294 | #endif | ||
| 295 | node->page[i] = page; | 291 | node->page[i] = page; |
| 296 | } | 292 | } |
| 297 | 293 | ||
| @@ -449,13 +445,6 @@ void hfs_bnode_get(struct hfs_bnode *node) | |||
| 449 | { | 445 | { |
| 450 | if (node) { | 446 | if (node) { |
| 451 | atomic_inc(&node->refcnt); | 447 | atomic_inc(&node->refcnt); |
| 452 | #if REF_PAGES | ||
| 453 | { | ||
| 454 | int i; | ||
| 455 | for (i = 0; i < node->tree->pages_per_bnode; i++) | ||
| 456 | get_page(node->page[i]); | ||
| 457 | } | ||
| 458 | #endif | ||
| 459 | dprint(DBG_BNODE_REFS, "get_node(%d:%d): %d\n", | 448 | dprint(DBG_BNODE_REFS, "get_node(%d:%d): %d\n", |
| 460 | node->tree->cnid, node->this, atomic_read(&node->refcnt)); | 449 | node->tree->cnid, node->this, atomic_read(&node->refcnt)); |
| 461 | } | 450 | } |
| @@ -472,20 +461,12 @@ void hfs_bnode_put(struct hfs_bnode *node) | |||
| 472 | node->tree->cnid, node->this, atomic_read(&node->refcnt)); | 461 | node->tree->cnid, node->this, atomic_read(&node->refcnt)); |
| 473 | if (!atomic_read(&node->refcnt)) | 462 | if (!atomic_read(&node->refcnt)) |
| 474 | BUG(); | 463 | BUG(); |
| 475 | if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock)) { | 464 | if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock)) |
| 476 | #if REF_PAGES | ||
| 477 | for (i = 0; i < tree->pages_per_bnode; i++) | ||
| 478 | put_page(node->page[i]); | ||
| 479 | #endif | ||
| 480 | return; | 465 | return; |
| 481 | } | ||
| 482 | for (i = 0; i < tree->pages_per_bnode; i++) { | 466 | for (i = 0; i < tree->pages_per_bnode; i++) { |
| 483 | if (!node->page[i]) | 467 | if (!node->page[i]) |
| 484 | continue; | 468 | continue; |
| 485 | mark_page_accessed(node->page[i]); | 469 | mark_page_accessed(node->page[i]); |
| 486 | #if REF_PAGES | ||
| 487 | put_page(node->page[i]); | ||
| 488 | #endif | ||
| 489 | } | 470 | } |
| 490 | 471 | ||
| 491 | if (test_bit(HFS_BNODE_DELETED, &node->flags)) { | 472 | if (test_bit(HFS_BNODE_DELETED, &node->flags)) { |
