Skip to content

Commit

Permalink
[PATCH] hfs: remove debug code
Browse files Browse the repository at this point in the history
This removes some old debug code, which is no longer needed.

Signed-off-by: Roman Zippel <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Roman Zippel authored and Linus Torvalds committed Sep 7, 2005
1 parent 8c702e1 commit a5e3985
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 40 deletions.
21 changes: 1 addition & 20 deletions fs/hfs/bnode.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@

#include "btree.h"

#define REF_PAGES 0

void hfs_bnode_read(struct hfs_bnode *node, void *buf,
int off, int len)
{
Expand Down Expand Up @@ -289,9 +287,7 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid)
page_cache_release(page);
goto fail;
}
#if !REF_PAGES
page_cache_release(page);
#endif
node->page[i] = page;
}

Expand Down Expand Up @@ -449,13 +445,6 @@ void hfs_bnode_get(struct hfs_bnode *node)
{
if (node) {
atomic_inc(&node->refcnt);
#if REF_PAGES
{
int i;
for (i = 0; i < node->tree->pages_per_bnode; i++)
get_page(node->page[i]);
}
#endif
dprint(DBG_BNODE_REFS, "get_node(%d:%d): %d\n",
node->tree->cnid, node->this, atomic_read(&node->refcnt));
}
Expand All @@ -472,20 +461,12 @@ void hfs_bnode_put(struct hfs_bnode *node)
node->tree->cnid, node->this, atomic_read(&node->refcnt));
if (!atomic_read(&node->refcnt))
BUG();
if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock)) {
#if REF_PAGES
for (i = 0; i < tree->pages_per_bnode; i++)
put_page(node->page[i]);
#endif
if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock))
return;
}
for (i = 0; i < tree->pages_per_bnode; i++) {
if (!node->page[i])
continue;
mark_page_accessed(node->page[i]);
#if REF_PAGES
put_page(node->page[i]);
#endif
}

if (test_bit(HFS_BNODE_DELETED, &node->flags)) {
Expand Down
21 changes: 1 addition & 20 deletions fs/hfsplus/bnode.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
#include "hfsplus_fs.h"
#include "hfsplus_raw.h"

#define REF_PAGES 0

/* Copy a specified range of bytes from the raw data of a node */
void hfs_bnode_read(struct hfs_bnode *node, void *buf, int off, int len)
{
Expand Down Expand Up @@ -450,9 +448,7 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid)
page_cache_release(page);
goto fail;
}
#if !REF_PAGES
page_cache_release(page);
#endif
node->page[i] = page;
}

Expand Down Expand Up @@ -612,13 +608,6 @@ void hfs_bnode_get(struct hfs_bnode *node)
{
if (node) {
atomic_inc(&node->refcnt);
#if REF_PAGES
{
int i;
for (i = 0; i < node->tree->pages_per_bnode; i++)
get_page(node->page[i]);
}
#endif
dprint(DBG_BNODE_REFS, "get_node(%d:%d): %d\n",
node->tree->cnid, node->this, atomic_read(&node->refcnt));
}
Expand All @@ -635,20 +624,12 @@ void hfs_bnode_put(struct hfs_bnode *node)
node->tree->cnid, node->this, atomic_read(&node->refcnt));
if (!atomic_read(&node->refcnt))
BUG();
if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock)) {
#if REF_PAGES
for (i = 0; i < tree->pages_per_bnode; i++)
put_page(node->page[i]);
#endif
if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock))
return;
}
for (i = 0; i < tree->pages_per_bnode; i++) {
if (!node->page[i])
continue;
mark_page_accessed(node->page[i]);
#if REF_PAGES
put_page(node->page[i]);
#endif
}

if (test_bit(HFS_BNODE_DELETED, &node->flags)) {
Expand Down

0 comments on commit a5e3985

Please sign in to comment.