Add device number to more log messages during activation.

diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 1861d06b89f4ca29db5bb21c0701f9944dfc0c81..48948bbc71e045f1b459a5fe380d7cf9dc946963 100644 (file)
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
 Version 1.02.34 - 
 ================================
+  Add device number to more log messages during activation.
 
 Version 1.02.33 - 30th June 2009
 ================================

diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index 616331add6c57fc7d1bb25920718cb829ec1af7f..648c0080a45c48b52ecce4951a5b3daec2480f74 100644 (file)
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
@@ -1263,7 +1263,10 @@ static int _emit_areas_line(struct dm_task *dmt __attribute((unused)),
        return 1;
 }
 
-static int _emit_segment_line(struct dm_task *dmt, struct load_segment *seg, uint64_t *seg_start, char *params, size_t paramsize)
+static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
+                             uint32_t minor, struct load_segment *seg,
+                             uint64_t *seg_start, char *params,
+                             size_t paramsize)
 {
        unsigned log_parm_count;
        int pos = 0;
@@ -1362,7 +1365,8 @@ static int _emit_segment_line(struct dm_task *dmt, struct load_segment *seg, uin
                break;
        }
 
-       log_debug("Adding target: %" PRIu64 " %" PRIu64 " %s %s",
+       log_debug("Adding target to (%" PRIu32 ":%" PRIu32 "): %" PRIu64
+                 " %" PRIu64 " %s %s", major, minor,
                  *seg_start, seg->size, dm_segtypes[seg->type].target, params);
 
        if (!dm_task_add_target(dmt, *seg_start, seg->size, dm_segtypes[seg->type].target, params))
@@ -1375,8 +1379,8 @@ static int _emit_segment_line(struct dm_task *dmt, struct load_segment *seg, uin
 
 #undef EMIT_PARAMS
 
-static int _emit_segment(struct dm_task *dmt, struct load_segment *seg,
-                        uint64_t *seg_start)
+static int _emit_segment(struct dm_task *dmt, uint32_t major, uint32_t minor,
+                        struct load_segment *seg, uint64_t *seg_start)
 {
        char *params;
        size_t paramsize = 4096;
@@ -1389,7 +1393,8 @@ static int _emit_segment(struct dm_task *dmt, struct load_segment *seg,
                }
 
                params[0] = '\0';
-               ret = _emit_segment_line(dmt, seg, seg_start, params, paramsize);
+               ret = _emit_segment_line(dmt, major, minor, seg, seg_start,
+                                        params, paramsize);
                dm_free(params);
 
                if (!ret)
@@ -1415,7 +1420,8 @@ static int _load_node(struct dm_tree_node *dnode)
        struct load_segment *seg;
        uint64_t seg_start = 0;
 
-       log_verbose("Loading %s table", dnode->name);
+       log_verbose("Loading %s table (%" PRIu32 ":%" PRIu32 ")", dnode->name,
+                   dnode->info.major, dnode->info.minor);
 
        if (!(dmt = dm_task_create(DM_DEVICE_RELOAD))) {
                log_error("Reload dm_task creation failed for %s", dnode->name);
@@ -1437,7 +1443,8 @@ static int _load_node(struct dm_tree_node *dnode)
                log_error("Failed to disable open_count");
 
        dm_list_iterate_items(seg, &dnode->props.segs)
-               if (!_emit_segment(dmt, seg, &seg_start))
+               if (!_emit_segment(dmt, dnode->info.major, dnode->info.minor,
+                                  seg, &seg_start))
                        goto_out;
 
        if (!dm_task_suppress_identical_reload(dmt))