multipath: clear checker message

Clear the checker message at the start of get_state, so that stale checker
messages aren't accidentally printed.

Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>

diff --git a/libmultipath/checkers.c b/libmultipath/checkers.c
index 19d0781..5cc31d2 100644 (file)
--- a/libmultipath/checkers.c
+++ b/libmultipath/checkers.c
@@ -183,6 +183,11 @@ char * checker_message (struct checker * c)
        return c->message;
 }
 
+void checker_clear_message (struct checker *c)
+{
+       c->message[0] = '\0';
+}
+
 void checker_get (struct checker * dst, char * name)
 {
        struct checker * src = checker_lookup(name);

diff --git a/libmultipath/checkers.h b/libmultipath/checkers.h
index 272cd8f..e61280d 100644 (file)
--- a/libmultipath/checkers.h
+++ b/libmultipath/checkers.h
@@ -114,6 +114,7 @@ int checker_check (struct checker *);
 int checker_selected (struct checker *);
 char * checker_name (struct checker *);
 char * checker_message (struct checker *);
+void checker_clear_message (struct checker *c);
 void checker_get (struct checker *, char *);
 
 #endif /* _CHECKERS_H */

diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
index 3b443e2..aa25cc4 100644 (file)
--- a/libmultipath/discovery.c
+++ b/libmultipath/discovery.c
@@ -848,6 +848,7 @@ get_state (struct path * pp, int daemon)
                        return PATH_UNCHECKED;
                }
        }
+       checker_clear_message(c);
        state = path_offline(pp);
        if (state != PATH_UP) {
                condlog(3, "%s: path inaccessible", pp->dev);