Skip to contentSkip to conversation

reiser4: change warnings to not scare users needlessly

PATCH New Hans Reiser 1 participant 1 message Jan 24, 2006 2 messages not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw

PATCH 1/1 reiser4: change warnings to not scare users needlessly

Signed-off-by Hans Reiser
Quoted 63 lines

1. re-phrase "disabling write barrier" warning which confuses users and

Quoted 58 lines

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.

---

fs/reiser4/debug.h  |    5 ++++-
fs/reiser4/search.c |    2 --
fs/reiser4/wander.c |    3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
fs/reiser4/debug.h +4 -1
@@ -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, ... )                \
fs/reiser4/search.c +0 -2
@@ -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);
fs/reiser4/wander.c +2 -1
@@ -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);
 }