From: Andrew Morton It clashes with a powerpc symbol. Cc: "Vladimir V. Saveliev" Cc: Hans Reiser Cc: Sachin Sant Signed-off-by: Andrew Morton --- fs/reiser4/plugin/item/sde.c | 2 +- fs/reiser4/search.c | 4 ++-- fs/reiser4/tree.h | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff -puN fs/reiser4/plugin/item/sde.c~reiser4-big-update-rename-print_address fs/reiser4/plugin/item/sde.c --- devel/fs/reiser4/plugin/item/sde.c~reiser4-big-update-rename-print_address 2006-02-10 13:05:51.000000000 -0800 +++ devel-akpm/fs/reiser4/plugin/item/sde.c 2006-02-10 13:05:51.000000000 -0800 @@ -59,7 +59,7 @@ char *extract_dent_name(const coord_t * unit_key_by_coord(coord, &key); if (get_key_type(&key) != KEY_FILE_NAME_MINOR) - print_address("oops", znode_get_block(coord->node)); + reiser4_print_address("oops", znode_get_block(coord->node)); if (!is_longname_key(&key)) { if (is_dot_key(&key)) return (char *)"."; diff -puN fs/reiser4/search.c~reiser4-big-update-rename-print_address fs/reiser4/search.c --- devel/fs/reiser4/search.c~reiser4-big-update-rename-print_address 2006-02-10 13:05:51.000000000 -0800 +++ devel-akpm/fs/reiser4/search.c 2006-02-10 13:05:51.000000000 -0800 @@ -733,7 +733,7 @@ static lookup_result traverse_tree(cbk_h "lock_mode: %s, bias: %s", h->error, h->level, h->lock_level, h->stop_level, lock_mode_name(h->lock_mode), bias_name(h->bias)); - print_address("block", &h->block); + reiser4_print_address("block", &h->block); print_key("key", h->key); print_coord_content("coord", h->coord); print_znode("active", h->active_lh->node); @@ -1519,7 +1519,7 @@ void print_coord_content(const char *pre } /* debugging aid: print human readable information about @block */ -void print_address(const char *prefix /* prefix to print */ , +void reiser4_print_address(const char *prefix /* prefix to print */ , const reiser4_block_nr * block /* block number to print */ ) { printk("%s: %s\n", prefix, sprint_address(block)); diff -puN fs/reiser4/tree.h~reiser4-big-update-rename-print_address fs/reiser4/tree.h --- devel/fs/reiser4/tree.h~reiser4-big-update-rename-print_address 2006-02-10 13:05:51.000000000 -0800 +++ devel-akpm/fs/reiser4/tree.h 2006-02-10 13:05:51.000000000 -0800 @@ -371,13 +371,14 @@ extern char *sprint_address(const reiser #if REISER4_DEBUG extern void print_coord_content(const char *prefix, coord_t * p); -extern void print_address(const char *prefix, const reiser4_block_nr * block); +extern void reiser4_print_address(const char *prefix, + const reiser4_block_nr * block); extern void print_tree_rec(const char *prefix, reiser4_tree * tree, __u32 flags); extern void check_dkeys(znode *node); #else #define print_coord_content(p, c) noop -#define print_address(p, b) noop +#define reiser4_print_address(p, b) noop #endif extern void forget_znode(lock_handle * handle); _