From: Alexander Zarochentsev 1. Re-phrase "disabling write barrier" warning which confuses users and make its prefix KERN_NOTICE instead of KERN_WARNING. 2. Remove the "[nikita-38210]: WARNING: stale dk" at fs/reiser4/search.c and "nikita-33281" at fs/reiser4/plugin/file/file.c which do not indicate any reiser4 tree or fs problems. Signed-off-by: Alexander Zarochentsev Signed-off-by: Andrew Morton --- fs/reiser4/debug.h | 5 ++++- fs/reiser4/plugin/file/file.c | 3 --- fs/reiser4/search.c | 2 -- fs/reiser4/wander.c | 3 ++- 4 files changed, 6 insertions(+), 7 deletions(-) diff -puN fs/reiser4/debug.h~reiser4-warnings-cleanup fs/reiser4/debug.h --- devel/fs/reiser4/debug.h~reiser4-warnings-cleanup 2006-01-25 11:35:09.000000000 -0800 +++ devel-akpm/fs/reiser4/debug.h 2006-01-25 11:35:09.000000000 -0800 @@ -208,10 +208,13 @@ extern int is_in_reiser4_context(void); #define wrong_return_value( label, function ) \ impossible( label, "wrong return value from " function ) -/* Issue warning message to the console */ +/* Issue different types of reiser4 messages to the console */ #define warning( label, format, ... ) \ DCALL( KERN_WARNING, \ printk, 1, label, "WARNING: " format , ## __VA_ARGS__ ) +#define notice( label, format, ... ) \ + DCALL( KERN_NOTICE, \ + printk, 1, label, "NOTICE: " format , ## __VA_ARGS__ ) /* mark not yet implemented functionality */ #define not_yet( label, format, ... ) \ diff -puN fs/reiser4/plugin/file/file.c~reiser4-warnings-cleanup fs/reiser4/plugin/file/file.c --- devel/fs/reiser4/plugin/file/file.c~reiser4-warnings-cleanup 2006-01-25 11:35:09.000000000 -0800 +++ devel-akpm/fs/reiser4/plugin/file/file.c 2006-01-25 11:35:09.000000000 -0800 @@ -1294,9 +1294,6 @@ capture_anonymous_jnodes(struct address_ /* result == 0. capture_anonymous_page returns 0 for Writeback-ed page. Set ANONYMOUS tag on that jnode */ - warning("nikita-33281", - "anonymous jnode in writeback: (%lu %lu)\n", - mapping->host->i_ino, index_jnode(jvec[i])); write_lock_irq(&mapping->tree_lock); radix_tree_tag_set(&mapping->page_tree, index_jnode(jvec[i]), diff -puN fs/reiser4/search.c~reiser4-warnings-cleanup fs/reiser4/search.c --- devel/fs/reiser4/search.c~reiser4-warnings-cleanup 2006-01-25 11:35:09.000000000 -0800 +++ devel-akpm/fs/reiser4/search.c 2006-01-25 11:35:09.000000000 -0800 @@ -1359,8 +1359,6 @@ static void update_stale_dk(reiser4_tree if (unlikely(ZF_ISSET(node, JNODE_RIGHT_CONNECTED) && right && ZF_ISSET(right, JNODE_DKSET) && !keyeq(&rd, znode_get_ld_key(right)))) { - /* does this ever happen? */ - warning("nikita-38210", "stale dk"); assert("nikita-38211", ZF_ISSET(node, JNODE_DKSET)); read_unlock_dk(tree); read_unlock_tree(tree); diff -puN fs/reiser4/wander.c~reiser4-warnings-cleanup fs/reiser4/wander.c --- devel/fs/reiser4/wander.c~reiser4-warnings-cleanup 2006-01-25 11:35:09.000000000 -0800 +++ devel-akpm/fs/reiser4/wander.c 2006-01-25 11:35:09.000000000 -0800 @@ -230,7 +230,8 @@ static inline int reiser4_use_write_barr static void disable_write_barrier(struct super_block * s) { - warning("zam-1055", "disabling write barrier\n"); + notice("zam-1055", "%s does not support write barriers," + " using synchronous write instead.\n", s->s_id); set_bit((int)REISER4_NO_WRITE_BARRIER, &get_super_private(s)->fs_flags); } _