shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

Add device number to more log messages during activation.

Browse Source
This commit is contained in:
Alasdair Kergon 2009-07-03 12:45:55 +00:00
parent b09a20e537
commit 4b2cae463e
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW_DM
View File

@ -1,5 +1,6 @@
Version 1.02.34 - Version 1.02.34 -
================================ ================================
Add device number to more log messages during activation.
Version 1.02.33 - 30th June 2009 Version 1.02.33 - 30th June 2009
================================ ================================

21
libdm/libdm-deptree.c
View File

@ -1263,7 +1263,10 @@ static int _emit_areas_line(struct dm_task *dmt __attribute((unused)),
return 1; 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; unsigned log_parm_count;
int pos = 0; int pos = 0;
@ -1362,7 +1365,8 @@ static int _emit_segment_line(struct dm_task *dmt, struct load_segment *seg, uin
break; 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); *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)) 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 #undef EMIT_PARAMS
static int _emit_segment(struct dm_task *dmt, struct load_segment *seg, static int _emit_segment(struct dm_task *dmt, uint32_t major, uint32_t minor,
uint64_t *seg_start) struct load_segment *seg, uint64_t *seg_start)
{ {
char *params; char *params;
size_t paramsize = 4096; size_t paramsize = 4096;
@ -1389,7 +1393,8 @@ static int _emit_segment(struct dm_task *dmt, struct load_segment *seg,
} }
params[0] = '\0'; 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); dm_free(params);
if (!ret) if (!ret)
@ -1415,7 +1420,8 @@ static int _load_node(struct dm_tree_node *dnode)
struct load_segment *seg; struct load_segment *seg;
uint64_t seg_start = 0; 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))) { if (!(dmt = dm_task_create(DM_DEVICE_RELOAD))) {
log_error("Reload dm_task creation failed for %s", dnode->name); 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"); log_error("Failed to disable open_count");
dm_list_iterate_items(seg, &dnode->props.segs) 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; goto_out;
if (!dm_task_suppress_identical_reload(dmt)) if (!dm_task_suppress_identical_reload(dmt))