[Patch] reiser4: change warnings to not scare users needlessly

[Hans Reiser]

Signed-off-by: Hans Reiser

> 1. re-phrase "disabling write barrier" warning which confuses users and
>
>>   make it KERN_NOTICE instead of KERN_WARNING.
>> 2. remove the "[nikita-38210]: WARNING: stale dk" at
>> fs/reiser4/search.c   which does not indicate any reiser4 tree or fs
>> problems.
>>
>> Signed-off-by: Alex Zarochentsev <zam@xxxxxxxxxxx>
>> ---
>>
>> fs/reiser4/debug.h  |    5 ++++-
>> fs/reiser4/search.c |    2 --
>> fs/reiser4/wander.c |    3 ++-
>> 3 files changed, 6 insertions(+), 4 deletions(-)
>>
>> --- linux-2.6.x.orig/fs/reiser4/debug.h
>> +++ linux-2.6.x/fs/reiser4/debug.h
>> @@ -205,10 +205,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, ... )                \
>> --- linux-2.6.x.orig/fs/reiser4/search.c
>> +++ linux-2.6.x/fs/reiser4/search.c
>> @@ -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);
>> --- linux-2.6.x.orig/fs/reiser4/wander.c
>> +++ linux-2.6.x/fs/reiser4/wander.c
>> @@ -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);
>> }
>>
>>
>>
>>  
>>
>
>
>

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/