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

suspend: optimize generated list

Browse Source 
Avoid adding same LV multiple times into the list.
Just saves couple extra calls and ioctls and makes log shorter.
This commit is contained in:
Zdenek Kabelac 2017-11-30 13:24:41 +01:00
parent 7e794b7748
commit 4dc8184803
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/activate/activate.c
View File

@ -2089,7 +2089,7 @@ static int _lv_suspend(struct cmd_context *cmd, const char *lvid_s,
const struct logical_volume *pvmove_lv = NULL; const struct logical_volume *pvmove_lv = NULL;
const struct logical_volume *lv_to_free = NULL; const struct logical_volume *lv_to_free = NULL;
const struct logical_volume *lv_pre_to_free = NULL; const struct logical_volume *lv_pre_to_free = NULL;
struct logical_volume *lv_pre_tmp; struct logical_volume *lv_pre_tmp, *lv_tmp;
struct seg_list *sl; struct seg_list *sl;
struct lv_segment *snap_seg; struct lv_segment *snap_seg;
struct lvinfo info; struct lvinfo info;
@ -2098,6 +2098,7 @@ static int _lv_suspend(struct cmd_context *cmd, const char *lvid_s,
struct dm_pool *mem = NULL; struct dm_pool *mem = NULL;
struct dm_list suspend_lvs; struct dm_list suspend_lvs;
struct lv_list *lvl; struct lv_list *lvl;
int found;
if (!activation()) if (!activation())
return 1; return 1;
@ -2247,19 +2248,28 @@ static int _lv_suspend(struct cmd_context *cmd, const char *lvid_s,
/* Prepare list of all LVs for suspend ahead */ /* Prepare list of all LVs for suspend ahead */
dm_list_init(&suspend_lvs); dm_list_init(&suspend_lvs);
dm_list_iterate_items(sl, &pvmove_lv->segs_using_this_lv) { dm_list_iterate_items(sl, &pvmove_lv->segs_using_this_lv) {
lv_tmp = sl->seg->lv;
if (lv_is_cow(lv_tmp))
/* Never suspend COW, always has to be origin */
lv_tmp = origin_from_cow(lv_tmp);
found = 0;
dm_list_iterate_items(lvl, &suspend_lvs)
if (strcmp(lvl->lv->name, lv_tmp->name) == 0) {
found = 1;
break;
}
if (found)
continue; /* LV is already in the list */
if (!(lvl = dm_pool_alloc(mem, sizeof(*lvl)))) { if (!(lvl = dm_pool_alloc(mem, sizeof(*lvl)))) {
log_error("lv_list alloc failed."); log_error("lv_list alloc failed.");
goto out; goto out;
} }
/* Look for precommitted LV name in commmitted VG */ /* Look for precommitted LV name in commmitted VG */
if (!(lvl->lv = find_lv(lv->vg, sl->seg->lv->name))) { if (!(lvl->lv = find_lv(lv->vg, lv_tmp->name))) {
log_error(INTERNAL_ERROR "LV %s missing from preload metadata.", log_error(INTERNAL_ERROR "LV %s missing from preload metadata.",
display_lvname(sl->seg->lv)); display_lvname(lv_tmp));
goto out; goto out;
} }
/* Never suspend COW, always has to be origin */
if (lv_is_cow(lvl->lv))
lvl->lv = origin_from_cow(lvl->lv);
dm_list_add(&suspend_lvs, &lvl->list); dm_list_add(&suspend_lvs, &lvl->list);
} }
dm_list_iterate_items(lvl, &suspend_lvs) dm_list_iterate_items(lvl, &suspend_lvs)