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

pvmove: finish no longer needs explicit resumed

Browse Source 
Activation code can see from holders needed LVs for resume.
This commit is contained in:
Zdenek Kabelac 2017-11-24 14:00:22 +01:00
parent 2a6981a697
commit 16ef133be2
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/pvmove_poll.c
View File

@ -92,10 +92,6 @@ int pvmove_update_metadata(struct cmd_context *cmd, struct volume_group *vg,
int pvmove_finish(struct cmd_context *cmd, struct volume_group *vg, int pvmove_finish(struct cmd_context *cmd, struct volume_group *vg,
struct logical_volume *lv_mirr, struct dm_list *lvs_changed) struct logical_volume *lv_mirr, struct dm_list *lvs_changed)
{ {
struct lv_list *lvl;
struct logical_volume *holder;
int r = 1;
if (!dm_list_empty(lvs_changed) && if (!dm_list_empty(lvs_changed) &&
(!_detach_pvmove_mirror(cmd, lv_mirr) || (!_detach_pvmove_mirror(cmd, lv_mirr) ||
!replace_lv_with_error_segment(lv_mirr))) { !replace_lv_with_error_segment(lv_mirr))) {
@ -106,19 +102,6 @@ int pvmove_finish(struct cmd_context *cmd, struct volume_group *vg,
if (!lv_update_and_reload(lv_mirr)) if (!lv_update_and_reload(lv_mirr))
return_0; return_0;
/* Takes locks and resumed volumes (should be still suspended, but preloaded) */
dm_list_iterate_items(lvl, lvs_changed) {
holder = (struct logical_volume *) lv_lock_holder(lvl->lv);
if (!resume_lv(cmd, holder)) {
log_error("Failed to reactivate logical volume %s.",
display_lvname(holder));
r = 0; /* But try to resume as much as we can */
}
}
if (!r)
return 0;
/* Deactivate mirror LV */ /* Deactivate mirror LV */
if (!deactivate_lv(cmd, lv_mirr)) { if (!deactivate_lv(cmd, lv_mirr)) {
log_error("ABORTING: Unable to deactivate temporary logical " log_error("ABORTING: Unable to deactivate temporary logical "