lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] hfs: remove debug code

Browse Source 
This removes some old debug code, which is no longer needed.

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Roman Zippel
2005-09-06 15:18:47 -07:00
committed by Linus Torvalds
parent 8c702e1620
commit a5e3985fa0
2 changed files with 2 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
fs/hfs/bnode.c
View File

@@ -13,8 +13,6 @@
#include "btree.h" #include "btree.h"
#define REF_PAGES 0
void hfs_bnode_read(struct hfs_bnode *node, void *buf, void hfs_bnode_read(struct hfs_bnode *node, void *buf,
int off, int len) int off, int len)
{ {
@@ -289,9 +287,7 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid)
page_cache_release(page); page_cache_release(page);
goto fail; goto fail;
} }
#if !REF_PAGES
page_cache_release(page); page_cache_release(page);
#endif
node->page[i] = page; node->page[i] = page;
} }
@@ -449,13 +445,6 @@ void hfs_bnode_get(struct hfs_bnode *node)
{ {
if (node) { if (node) {
atomic_inc(&node->refcnt); 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", dprint(DBG_BNODE_REFS, "get_node(%d:%d): %d\n",
node->tree->cnid, node->this, atomic_read(&node->refcnt)); node->tree->cnid, node->this, atomic_read(&node->refcnt));
} }
@@ -472,20 +461,12 @@ void hfs_bnode_put(struct hfs_bnode *node)
node->tree->cnid, node->this, atomic_read(&node->refcnt)); node->tree->cnid, node->this, atomic_read(&node->refcnt));
if (!atomic_read(&node->refcnt)) if (!atomic_read(&node->refcnt))
BUG(); BUG();
if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock)) { 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
return; return;
}
for (i = 0; i < tree->pages_per_bnode; i++) { for (i = 0; i < tree->pages_per_bnode; i++) {
if (!node->page[i]) if (!node->page[i])
continue; continue;
mark_page_accessed(node->page[i]); mark_page_accessed(node->page[i]);
#if REF_PAGES
put_page(node->page[i]);
#endif
} }
if (test_bit(HFS_BNODE_DELETED, &node->flags)) { if (test_bit(HFS_BNODE_DELETED, &node->flags)) {

21
fs/hfsplus/bnode.c
View File

@@ -18,8 +18,6 @@
#include "hfsplus_fs.h" #include "hfsplus_fs.h"
#include "hfsplus_raw.h" #include "hfsplus_raw.h"
#define REF_PAGES 0
/* Copy a specified range of bytes from the raw data of a node */ /* 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) void hfs_bnode_read(struct hfs_bnode *node, void *buf, int off, int len)
{ {
@@ -450,9 +448,7 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid)
page_cache_release(page); page_cache_release(page);
goto fail; goto fail;
} }
#if !REF_PAGES
page_cache_release(page); page_cache_release(page);
#endif
node->page[i] = page; node->page[i] = page;
} }
@@ -612,13 +608,6 @@ void hfs_bnode_get(struct hfs_bnode *node)
{ {
if (node) { if (node) {
atomic_inc(&node->refcnt); 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", dprint(DBG_BNODE_REFS, "get_node(%d:%d): %d\n",
node->tree->cnid, node->this, atomic_read(&node->refcnt)); node->tree->cnid, node->this, atomic_read(&node->refcnt));
} }
@@ -635,20 +624,12 @@ void hfs_bnode_put(struct hfs_bnode *node)
node->tree->cnid, node->this, atomic_read(&node->refcnt)); node->tree->cnid, node->this, atomic_read(&node->refcnt));
if (!atomic_read(&node->refcnt)) if (!atomic_read(&node->refcnt))
BUG(); BUG();
if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock)) { 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
return; return;
}
for (i = 0; i < tree->pages_per_bnode; i++) { for (i = 0; i < tree->pages_per_bnode; i++) {
if (!node->page[i]) if (!node->page[i])
continue; continue;
mark_page_accessed(node->page[i]); mark_page_accessed(node->page[i]);
#if REF_PAGES
put_page(node->page[i]);
#endif
} }
if (test_bit(HFS_BNODE_DELETED, &node->flags)) { if (test_bit(HFS_BNODE_DELETED, &node->flags)) {