shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

polldaemon.c: call find_lv directly

Browse Source
This commit is contained in:
Ondrej Kozina 2015-05-19 15:08:50 +02:00
parent 08114840ca
commit 6fba37777c
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/polldaemon.c
View File

@ -179,7 +179,12 @@ int wait_for_single_lv(struct cmd_context *cmd, struct poll_operation_id *id,
return 0; return 0;
} }
lv = parms->poll_fns->get_copy_lv(cmd, vg, id->lv_name, id->uuid, parms->lv_type); lv = find_lv(vg, id->lv_name);
if (lv && id->uuid && strcmp(id->uuid, (char *)&lv->lvid))
lv = NULL;
if (lv && parms->lv_type && !(lv->status & parms->lv_type))
lv = NULL;
if (!lv && parms->lv_type == PVMOVE) { if (!lv && parms->lv_type == PVMOVE) {
log_print_unless_silent("%s: No pvmove in progress - already finished or aborted.", log_print_unless_silent("%s: No pvmove in progress - already finished or aborted.",
@ -339,8 +344,13 @@ static int _poll_vg(struct cmd_context *cmd, const char *vgname,
/* perform the poll operation on LVs collected in previous cycle */ /* perform the poll operation on LVs collected in previous cycle */
dm_list_iterate_items(idl, &idls) { dm_list_iterate_items(idl, &idls) {
lv = parms->poll_fns->get_copy_lv(cmd, vg, idl->id->lv_name, idl->id->uuid, parms->lv_type); if (!(lv = find_lv(vg, idl->id->lv_name)))
if (lv && _check_lv_status(cmd, vg, lv, idl->id->display_name, parms, &finished) && !finished) continue;
if (idl->id->uuid && strcmp(idl->id->uuid, (char *)&lv->lvid))
continue;
if (parms->lv_type && !(lv->status & parms->lv_type))
continue;
if (_check_lv_status(cmd, vg, lv, idl->id->display_name, parms, &finished) && !finished)
parms->outstanding_count++; parms->outstanding_count++;
} }
@ -386,7 +396,13 @@ static int report_progress(struct cmd_context *cmd, struct poll_operation_id *id
return 0; return 0;
} }
lv = parms->poll_fns->get_copy_lv(cmd, vg, id->lv_name, id->uuid, parms->lv_type); lv = find_lv(vg, id->lv_name);
if (lv && id->uuid && strcmp(id->uuid, (char *)&lv->lvid))
lv = NULL;
if (lv && parms->lv_type && !(lv->status & parms->lv_type))
lv = NULL;
if (!lv && parms->lv_type == PVMOVE) { if (!lv && parms->lv_type == PVMOVE) {
log_print_unless_silent("%s: No pvmove in progress - already finished or aborted.", log_print_unless_silent("%s: No pvmove in progress - already finished or aborted.",
id->display_name); id->display_name);