[multipathd] some more output coherency

diff --git a/libmultipath/structs_vec.c b/libmultipath/structs_vec.c
index b0dc095..1a6d8e2 100644 (file)
--- a/libmultipath/structs_vec.c
+++ b/libmultipath/structs_vec.c
@@ -59,8 +59,8 @@ adopt_paths (vector pathvec, struct multipath * mpp)
 
        vector_foreach_slot (pathvec, pp, i) {
                if (!strncmp(mpp->wwid, pp->wwid, WWID_SIZE)) {
-                       condlog(3, "%s ownership set to %s",
-                               pp->dev_t, mpp->alias);
+                       condlog(3, "%s: ownership set to %s",
+                               pp->dev, mpp->alias);
                        pp->mpp = mpp;
                        
                        if (!mpp->paths && !(mpp->paths = vector_alloc()))
@@ -97,7 +97,7 @@ orphan_paths (vector pathvec, struct multipath * mpp)
 
        vector_foreach_slot (pathvec, pp, i) {
                if (pp->mpp == mpp) {
-                       condlog(4, "%s is orphaned", pp->dev_t);
+                       condlog(4, "%s: orphaned", pp->dev);
                        orphan_path(pp);
                }
        }

diff --git a/multipathd/main.c b/multipathd/main.c
index 7f2bfa6..91a1597 100644 (file)
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -62,7 +62,7 @@
 #define CMDSIZE 160
 
 #define LOG_MSG(a,b) \
-       if (strlen(b)) condlog(a, "%s: %s", pp->dev_t, b);
+       if (strlen(b)) condlog(a, "%s: %s", pp->dev, b);
 
 pthread_cond_t exit_cond = PTHREAD_COND_INITIALIZER;
 pthread_mutex_t exit_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -534,7 +534,7 @@ ev_remove_path (char * devname, struct vectors * vecs)
                                }
                                sync_map_state(mpp);
 
-                               condlog(3, "%s path removed from devmap %s",
+                               condlog(3, "%s: path removed from map %s",
                                        devname, mpp->alias);
                        }
                        free_pathvec(rpvec, KEEP_PATHS);