shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-02-25 21:57:45 +03:00
Code Releases Activity

cleanup: move verbose message to lv_activation_skip

Browse Source 
Simplify code and put verbose message into a single place.
This commit is contained in:
Zdenek Kabelac 2014-02-18 20:49:32 +01:00
parent fdcd95a3b3
commit fb519c35bb
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/metadata/lv_manip.c
View File

@ -5675,14 +5675,14 @@ void lv_set_activation_skip(struct logical_volume *lv, int override_default,
int lv_activation_skip(struct logical_volume *lv, activation_change_t activate,
int override_lv_skip_flag, int skip)
{
/* Do not skip deactivation! */
if ((activate == CHANGE_AN) || (activate == CHANGE_ALN))
if (!(lv->status & LV_ACTIVATION_SKIP) ||
!is_change_activating(activate) || /* Do not skip deactivation */
(override_lv_skip_flag && !skip))
return 0;
if (override_lv_skip_flag)
return skip;
return (lv->status & LV_ACTIVATION_SKIP) ? 1 : 0;
log_verbose("ACTIVATON_SKIP flag set for LV %s/%s, skipping activation.",
lv->vg->name, lv->name);
return 1;
}
/* Greatest common divisor */

5
tools/lvchange.c
View File

@ -215,11 +215,8 @@ static int _lvchange_activate(struct cmd_context *cmd, struct logical_volume *lv
activate = (activation_change_t) arg_uint_value(cmd, activate_ARG, CHANGE_AY);
if (lv_activation_skip(lv, activate, arg_count(cmd, ignoreactivationskip_ARG), 0)) {
log_verbose("ACTIVATON_SKIP flag set for LV %s/%s, skipping activation.",
lv->vg->name, lv->name);
if (lv_activation_skip(lv, activate, arg_count(cmd, ignoreactivationskip_ARG), 0))
return 1;
}
if (lv_is_cow(lv) && !lv_is_virtual_origin(origin_from_cow(lv)))
lv = origin_from_cow(lv);

5
tools/vgchange.c
View File

@ -121,11 +121,8 @@ static int _activate_lvs_in_vg(struct cmd_context *cmd, struct volume_group *vg,
((lv->status & PVMOVE) ))
continue;
if (lv_activation_skip(lv, activate, arg_count(cmd, ignoreactivationskip_ARG), 0)) {
log_verbose("ACTIVATION_SKIP flag set for LV %s/%s, skipping activation.",
lv->vg->name, lv->name);
if (lv_activation_skip(lv, activate, arg_count(cmd, ignoreactivationskip_ARG), 0))
continue;
}
if ((activate == CHANGE_AAY) &&
!lv_passes_auto_activation_filter(cmd, lv))