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

cleanup: use lv_is_partial

Browse Source 
Check for PARTIAL_LV flag in standard way.
This commit is contained in:
Zdenek Kabelac 2016-03-02 20:59:03 +01:00
parent a975dc530e
commit e04a0184cb
10 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/activate/activate.c
View File

@ -2243,7 +2243,7 @@ static int _lv_activate(struct cmd_context *cmd, const char *lvid_s,
goto out; goto out;
} }
if ((!lv->vg->cmd->partial_activation) && (lv->status & PARTIAL_LV)) { if ((!lv->vg->cmd->partial_activation) && lv_is_partial(lv)) {
if (!lv_is_raid_type(lv) || !partial_raid_lv_supports_degraded_activation(lv)) { if (!lv_is_raid_type(lv) || !partial_raid_lv_supports_degraded_activation(lv)) {
log_error("Refusing activation of partial LV %s. " log_error("Refusing activation of partial LV %s. "
"Use '--activationmode partial' to override.", "Use '--activationmode partial' to override.",

2
lib/metadata/lv.c
View File

@ -1173,7 +1173,7 @@ char *lv_attr_dup_with_info_and_seg_status(struct dm_pool *mem, const struct lv_
repstr[7] = '-'; repstr[7] = '-';
repstr[8] = '-'; repstr[8] = '-';
if (lv->status & PARTIAL_LV) if (lv_is_partial(lv))
repstr[8] = 'p'; repstr[8] = 'p';
else if (lv_is_raid_type(lv)) { else if (lv_is_raid_type(lv)) {
uint64_t n; uint64_t n;

2
lib/metadata/lv_manip.c
View File

@ -1360,7 +1360,7 @@ int replace_lv_with_error_segment(struct logical_volume *lv)
int lv_refresh_suspend_resume(struct cmd_context *cmd, struct logical_volume *lv) int lv_refresh_suspend_resume(struct cmd_context *cmd, struct logical_volume *lv)
{ {
if (!cmd->partial_activation && (lv->status & PARTIAL_LV)) { if (!cmd->partial_activation && lv_is_partial(lv)) {
log_error("Refusing refresh of partial LV %s." log_error("Refusing refresh of partial LV %s."
" Use '--activationmode partial' to override.", " Use '--activationmode partial' to override.",
display_lvname(lv)); display_lvname(lv));

1
lib/metadata/metadata-exported.h
View File

@ -193,6 +193,7 @@
#define vg_is_archived(vg) (((vg)->status & ARCHIVED_VG) ? 1 : 0) #define vg_is_archived(vg) (((vg)->status & ARCHIVED_VG) ? 1 : 0)
#define lv_is_locked(lv) (((lv)->status & LOCKED) ? 1 : 0) #define lv_is_locked(lv) (((lv)->status & LOCKED) ? 1 : 0)
#define lv_is_partial(lv) (((lv)->status & PARTIAL_LV) ? 1 : 0)
#define lv_is_virtual(lv) (((lv)->status & VIRTUAL) ? 1 : 0) #define lv_is_virtual(lv) (((lv)->status & VIRTUAL) ? 1 : 0)
#define lv_is_merging(lv) (((lv)->status & MERGING) ? 1 : 0) #define lv_is_merging(lv) (((lv)->status & MERGING) ? 1 : 0)
#define lv_is_merging_origin(lv) (lv_is_merging(lv)) #define lv_is_merging_origin(lv) (lv_is_merging(lv))

3
lib/metadata/metadata.c
View File

@ -2471,7 +2471,8 @@ struct _lv_mark_if_partial_baton {
static int _lv_mark_if_partial_collect(struct logical_volume *lv, void *data) static int _lv_mark_if_partial_collect(struct logical_volume *lv, void *data)
{ {
struct _lv_mark_if_partial_baton *baton = data; struct _lv_mark_if_partial_baton *baton = data;
if (baton && lv->status & PARTIAL_LV)
if (baton && lv_is_partial(lv))
baton->partial = 1; baton->partial = 1;
return 1; return 1;

4
lib/metadata/mirror.c
View File

@ -935,7 +935,7 @@ static int _remove_mirror_images(struct logical_volume *lv,
* not in-sync. * not in-sync.
*/ */
if ((s == 0) && !_mirrored_lv_in_sync(lv) && if ((s == 0) && !_mirrored_lv_in_sync(lv) &&
!(lv->status & PARTIAL_LV)) { !(lv_is_partial(lv))) {
log_error("Unable to remove primary mirror image while mirror is not in-sync"); log_error("Unable to remove primary mirror image while mirror is not in-sync");
return 0; return 0;
} }
@ -1034,7 +1034,7 @@ static int _remove_mirror_images(struct logical_volume *lv,
* the only way to release the pending writes. * the only way to release the pending writes.
*/ */
if (detached_log_lv && lv_is_mirrored(detached_log_lv) && if (detached_log_lv && lv_is_mirrored(detached_log_lv) &&
(detached_log_lv->status & PARTIAL_LV)) { lv_is_partial(detached_log_lv)) {
struct lv_segment *seg = first_seg(detached_log_lv); struct lv_segment *seg = first_seg(detached_log_lv);
log_very_verbose("%s being removed due to failures", log_very_verbose("%s being removed due to failures",

29
lib/metadata/raid_manip.c
View File

@ -1500,18 +1500,18 @@ static int _remove_partial_multi_segment_image(struct logical_volume *lv,
struct logical_volume *rm_image = NULL; struct logical_volume *rm_image = NULL;
struct physical_volume *pv; struct physical_volume *pv;
if (!(lv->status & PARTIAL_LV)) if (!lv_is_partial(lv))
return_0; return_0;
for (s = 0; s < raid_seg->area_count; s++) { for (s = 0; s < raid_seg->area_count; s++) {
extents_needed = 0; extents_needed = 0;
if ((seg_lv(raid_seg, s)->status & PARTIAL_LV) && if (lv_is_partial(seg_lv(raid_seg, s)) &&
lv_is_on_pvs(seg_lv(raid_seg, s), remove_pvs) && lv_is_on_pvs(seg_lv(raid_seg, s), remove_pvs) &&
(dm_list_size(&(seg_lv(raid_seg, s)->segments)) > 1)) { (dm_list_size(&(seg_lv(raid_seg, s)->segments)) > 1)) {
rm_image = seg_lv(raid_seg, s); rm_image = seg_lv(raid_seg, s);
/* First, how many damaged extents are there */ /* First, how many damaged extents are there */
if (seg_metalv(raid_seg, s)->status & PARTIAL_LV) if (lv_is_partial(seg_metalv(raid_seg, s)))
extents_needed += seg_metalv(raid_seg, s)->le_count; extents_needed += seg_metalv(raid_seg, s)->le_count;
dm_list_iterate_items(rm_seg, &rm_image->segments) { dm_list_iterate_items(rm_seg, &rm_image->segments) {
/* /*
@ -1576,8 +1576,7 @@ static int _avoid_pvs_of_lv(struct logical_volume *lv, void *data)
struct pv_list *pvl; struct pv_list *pvl;
dm_list_iterate_items(pvl, allocate_pvs) dm_list_iterate_items(pvl, allocate_pvs)
if (!(lv->status & PARTIAL_LV) && if (!lv_is_partial(lv) && lv_is_on_pv(lv, pvl->pv))
lv_is_on_pv(lv, pvl->pv))
pvl->pv->status |= PV_ALLOCATION_PROHIBITED; pvl->pv->status |= PV_ALLOCATION_PROHIBITED;
return 1; return 1;
@ -1617,7 +1616,7 @@ int lv_raid_replace(struct logical_volume *lv,
dm_list_init(&new_meta_lvs); dm_list_init(&new_meta_lvs);
dm_list_init(&new_data_lvs); dm_list_init(&new_data_lvs);
if (lv->status & PARTIAL_LV) if (lv_is_partial(lv))
lv->vg->cmd->partial_activation = 1; lv->vg->cmd->partial_activation = 1;
if (!lv_is_active_exclusive_locally(lv_lock_holder(lv))) { if (!lv_is_active_exclusive_locally(lv_lock_holder(lv))) {
@ -1708,7 +1707,7 @@ int lv_raid_replace(struct logical_volume *lv,
try_again: try_again:
if (!_alloc_image_components(lv, allocate_pvs, match_count, if (!_alloc_image_components(lv, allocate_pvs, match_count,
&new_meta_lvs, &new_data_lvs)) { &new_meta_lvs, &new_data_lvs)) {
if (!(lv->status & PARTIAL_LV)) { if (!lv_is_partial(lv)) {
log_error("LV %s in not partial.", display_lvname(lv)); log_error("LV %s in not partial.", display_lvname(lv));
return 0; return 0;
} }
@ -1853,7 +1852,7 @@ int lv_raid_remove_missing(struct logical_volume *lv)
uint32_t s; uint32_t s;
struct lv_segment *seg = first_seg(lv); struct lv_segment *seg = first_seg(lv);
if (!(lv->status & PARTIAL_LV)) { if (!lv_is_partial(lv)) {
log_error(INTERNAL_ERROR "%s/%s is not a partial LV", log_error(INTERNAL_ERROR "%s/%s is not a partial LV",
lv->vg->name, lv->name); lv->vg->name, lv->name);
return 0; return 0;
@ -1870,8 +1869,8 @@ int lv_raid_remove_missing(struct logical_volume *lv)
*/ */
for (s = 0; s < seg->area_count; s++) { for (s = 0; s < seg->area_count; s++) {
if (!(seg_lv(seg, s)->status & PARTIAL_LV) && if (!lv_is_partial(seg_lv(seg, s)) &&
!(seg_metalv(seg, s)->status & PARTIAL_LV)) !lv_is_partial(seg_metalv(seg, s)))
continue; continue;
log_debug("Replacing %s and %s segments with error target", log_debug("Replacing %s and %s segments with error target",
@ -1911,8 +1910,8 @@ static int _partial_raid_lv_is_redundant(const struct logical_volume *lv)
if (!(i % copies)) if (!(i % copies))
rebuilds_per_group = 0; rebuilds_per_group = 0;
if ((seg_lv(raid_seg, s)->status & PARTIAL_LV) || if (lv_is_partial(seg_lv(raid_seg, s)) ||
(seg_metalv(raid_seg, s)->status & PARTIAL_LV) || lv_is_partial(seg_metalv(raid_seg, s)) ||
lv_is_virtual(seg_lv(raid_seg, s)) || lv_is_virtual(seg_lv(raid_seg, s)) ||
lv_is_virtual(seg_metalv(raid_seg, s))) lv_is_virtual(seg_metalv(raid_seg, s)))
rebuilds_per_group++; rebuilds_per_group++;
@ -1928,8 +1927,8 @@ static int _partial_raid_lv_is_redundant(const struct logical_volume *lv)
} }
for (s = 0; s < raid_seg->area_count; s++) { for (s = 0; s < raid_seg->area_count; s++) {
if ((seg_lv(raid_seg, s)->status & PARTIAL_LV) || if (lv_is_partial(seg_lv(raid_seg, s)) ||
(seg_metalv(raid_seg, s)->status & PARTIAL_LV) || lv_is_partial(seg_metalv(raid_seg, s)) ||
lv_is_virtual(seg_lv(raid_seg, s)) || lv_is_virtual(seg_lv(raid_seg, s)) ||
lv_is_virtual(seg_metalv(raid_seg, s))) lv_is_virtual(seg_metalv(raid_seg, s)))
failed_components++; failed_components++;
@ -1961,7 +1960,7 @@ static int _lv_may_be_activated_in_degraded_mode(struct logical_volume *lv, void
if (*not_capable) if (*not_capable)
return 1; /* No further checks needed */ return 1; /* No further checks needed */
if (!(lv->status & PARTIAL_LV)) if (!lv_is_partial(lv))
return 1; return 1;
if (lv_is_raid(lv)) { if (lv_is_raid(lv)) {

2
lib/report/report.c
View File

@ -3298,7 +3298,7 @@ static int _lvhealthstatus_disp(struct dm_report *rh, struct dm_pool *mem,
const char *health = ""; const char *health = "";
uint64_t n; uint64_t n;
if (lv->status & PARTIAL_LV) if (lv_is_partial(lv))
health = "partial"; health = "partial";
else if (lv_is_raid_type(lv)) { else if (lv_is_raid_type(lv)) {
if (!activation()) if (!activation())

8
tools/lvconvert.c
View File

@ -854,7 +854,7 @@ static int _failed_mirrors_count(struct logical_volume *lv)
if (seg_type(lvseg, s) == AREA_LV) { if (seg_type(lvseg, s) == AREA_LV) {
if (is_temporary_mirror_layer(seg_lv(lvseg, s))) if (is_temporary_mirror_layer(seg_lv(lvseg, s)))
ret += _failed_mirrors_count(seg_lv(lvseg, s)); ret += _failed_mirrors_count(seg_lv(lvseg, s));
else if (seg_lv(lvseg, s)->status & PARTIAL_LV) else if (lv_is_partial(seg_lv(lvseg, s)))
++ ret; ++ ret;
} }
else if (seg_type(lvseg, s) == AREA_PV && else if (seg_type(lvseg, s) == AREA_PV &&
@ -871,7 +871,7 @@ static int _failed_logs_count(struct logical_volume *lv)
int ret = 0; int ret = 0;
unsigned s; unsigned s;
struct logical_volume *log_lv = first_seg(lv)->log_lv; struct logical_volume *log_lv = first_seg(lv)->log_lv;
if (log_lv && (log_lv->status & PARTIAL_LV)) { if (log_lv && lv_is_partial(log_lv)) {
if (lv_is_mirrored(log_lv)) if (lv_is_mirrored(log_lv))
ret += _failed_mirrors_count(log_lv); ret += _failed_mirrors_count(log_lv);
else else
@ -926,7 +926,7 @@ static struct dm_list *_failed_pv_list(struct volume_group *vg)
static int _is_partial_lv(struct logical_volume *lv, static int _is_partial_lv(struct logical_volume *lv,
void *baton __attribute__((unused))) void *baton __attribute__((unused)))
{ {
return lv->status & PARTIAL_LV; return lv_is_partial(lv);
} }
/* /*
@ -1499,7 +1499,7 @@ static int _lvconvert_mirrors_repair(struct cmd_context *cmd,
lv_check_transient(lv); /* TODO check this in lib for all commands? */ lv_check_transient(lv); /* TODO check this in lib for all commands? */
if (!(lv->status & PARTIAL_LV)) { if (!lv_is_partial(lv)) {
log_print_unless_silent("Volume %s is consistent. Nothing to repair.", log_print_unless_silent("Volume %s is consistent. Nothing to repair.",
display_lvname(lv)); display_lvname(lv));
return 1; return 1;

4
tools/vgreduce.c
View File

@ -51,7 +51,7 @@ static int _consolidate_vg(struct cmd_context *cmd, struct volume_group *vg)
int r = 1; int r = 1;
dm_list_iterate_items(lvl, &vg->lvs) dm_list_iterate_items(lvl, &vg->lvs)
if (lvl->lv->status & PARTIAL_LV) { if (lv_is_partial(lvl->lv)) {
log_warn("WARNING: Partial LV %s needs to be repaired " log_warn("WARNING: Partial LV %s needs to be repaired "
"or removed. ", lvl->lv->name); "or removed. ", lvl->lv->name);
r = 0; r = 0;
@ -88,7 +88,7 @@ static int _make_vg_consistent(struct cmd_context *cmd, struct volume_group *vg)
lv = lvl->lv; lv = lvl->lv;
/* Are any segments of this LV on missing PVs? */ /* Are any segments of this LV on missing PVs? */
if (lv->status & PARTIAL_LV) { if (lv_is_partial(lv)) {
if (seg_is_raid(first_seg(lv))) { if (seg_is_raid(first_seg(lv))) {
if (!lv_raid_remove_missing(lv)) if (!lv_raid_remove_missing(lv))
return_0; return_0;