diff options
Diffstat (limited to 'fs/hfsplus/bnode.c')
| -rw-r--r-- | fs/hfsplus/bnode.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/fs/hfsplus/bnode.c b/fs/hfsplus/bnode.c index 8868d3b766fd..b85abc6e6f83 100644 --- a/fs/hfsplus/bnode.c +++ b/fs/hfsplus/bnode.c | |||
| @@ -18,8 +18,6 @@ | |||
| 18 | #include "hfsplus_fs.h" | 18 | #include "hfsplus_fs.h" |
| 19 | #include "hfsplus_raw.h" | 19 | #include "hfsplus_raw.h" |
| 20 | 20 | ||
| 21 | #define REF_PAGES 0 | ||
| 22 | |||
| 23 | /* Copy a specified range of bytes from the raw data of a node */ | 21 | /* Copy a specified range of bytes from the raw data of a node */ |
| 24 | void hfs_bnode_read(struct hfs_bnode *node, void *buf, int off, int len) | 22 | void hfs_bnode_read(struct hfs_bnode *node, void *buf, int off, int len) |
| 25 | { | 23 | { |
| @@ -450,9 +448,7 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid) | |||
| 450 | page_cache_release(page); | 448 | page_cache_release(page); |
| 451 | goto fail; | 449 | goto fail; |
| 452 | } | 450 | } |
| 453 | #if !REF_PAGES | ||
| 454 | page_cache_release(page); | 451 | page_cache_release(page); |
| 455 | #endif | ||
| 456 | node->page[i] = page; | 452 | node->page[i] = page; |
| 457 | } | 453 | } |
| 458 | 454 | ||
| @@ -612,13 +608,6 @@ void hfs_bnode_get(struct hfs_bnode *node) | |||
| 612 | { | 608 | { |
| 613 | if (node) { | 609 | if (node) { |
| 614 | atomic_inc(&node->refcnt); | 610 | atomic_inc(&node->refcnt); |
| 615 | #if REF_PAGES | ||
| 616 | { | ||
| 617 | int i; | ||
| 618 | for (i = 0; i < node->tree->pages_per_bnode; i++) | ||
| 619 | get_page(node->page[i]); | ||
| 620 | } | ||
| 621 | #endif | ||
| 622 | dprint(DBG_BNODE_REFS, "get_node(%d:%d): %d\n", | 611 | dprint(DBG_BNODE_REFS, "get_node(%d:%d): %d\n", |
| 623 | node->tree->cnid, node->this, atomic_read(&node->refcnt)); | 612 | node->tree->cnid, node->this, atomic_read(&node->refcnt)); |
| 624 | } | 613 | } |
| @@ -635,20 +624,12 @@ void hfs_bnode_put(struct hfs_bnode *node) | |||
| 635 | node->tree->cnid, node->this, atomic_read(&node->refcnt)); | 624 | node->tree->cnid, node->this, atomic_read(&node->refcnt)); |
| 636 | if (!atomic_read(&node->refcnt)) | 625 | if (!atomic_read(&node->refcnt)) |
| 637 | BUG(); | 626 | BUG(); |
| 638 | if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock)) { | 627 | if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock)) |
| 639 | #if REF_PAGES | ||
| 640 | for (i = 0; i < tree->pages_per_bnode; i++) | ||
| 641 | put_page(node->page[i]); | ||
| 642 | #endif | ||
| 643 | return; | 628 | return; |
| 644 | } | ||
| 645 | for (i = 0; i < tree->pages_per_bnode; i++) { | 629 | for (i = 0; i < tree->pages_per_bnode; i++) { |
| 646 | if (!node->page[i]) | 630 | if (!node->page[i]) |
| 647 | continue; | 631 | continue; |
| 648 | mark_page_accessed(node->page[i]); | 632 | mark_page_accessed(node->page[i]); |
| 649 | #if REF_PAGES | ||
| 650 | put_page(node->page[i]); | ||
| 651 | #endif | ||
| 652 | } | 633 | } |
| 653 | 634 | ||
| 654 | if (test_bit(HFS_BNODE_DELETED, &node->flags)) { | 635 | if (test_bit(HFS_BNODE_DELETED, &node->flags)) { |
