diff options
| author | Heinz Mauelshagen <heinzm@redhat.com> | 2018-11-06 00:57:05 +0100 |
|---|---|---|
| committer | Heinz Mauelshagen <heinzm@redhat.com> | 2018-11-06 00:57:36 +0100 |
| commit | 648299d2454bda8729fe2eac66c7e3c9187a3ed1 (patch) | |
| tree | 3605328f0031a7b97bfdbe0b96e8827b79efec30 | |
| parent | 50e19dc22695b1ecdb4fb3b0884a09c82d0333e0 (diff) | |
| download | lvm2-dev-lvmguy-bz1633167-2.tar.gz | |
raid: use persistent LV_ACTIVATION_SKIP instead of LV_TEMPORARYdev-lvmguy-bz1633167-2
| -rw-r--r-- | lib/metadata/lv_manip.c | 4 | ||||
| -rw-r--r-- | lib/metadata/merge.c | 4 | ||||
| -rw-r--r-- | tools/lvchange.c | 4 | ||||
| -rw-r--r-- | tools/lvconvert.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 1c7a1643a..77be89641 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -4165,7 +4165,7 @@ static int _lv_extend_layered_lv(struct alloc_handle *ah, * we can avoid activating crashed, potentially partially * wiped RaidLVs. */ - lv->status |= LV_TEMPORARY; + lv->status |= LV_ACTIVATION_SKIP; if (test_mode()) { /* FIXME VG is not in a fully-consistent state here and should not be committed! */ @@ -4196,7 +4196,7 @@ static int _lv_extend_layered_lv(struct alloc_handle *ah, for (s = 0; s < seg->area_count; s++) lv_set_hidden(seg_metalv(seg, s)); - lv->status &= ~LV_TEMPORARY; + lv->status &= ~LV_ACTIVATION_SKIP; } return 1; diff --git a/lib/metadata/merge.c b/lib/metadata/merge.c index e3acc53c8..2ec160a82 100644 --- a/lib/metadata/merge.c +++ b/lib/metadata/merge.c @@ -243,7 +243,7 @@ static void _check_raid_sublvs(struct lv_segment *seg, int *error_count) raid_seg_error("no raid image SubLV"); if ((seg_lv(seg, s)->status & LVM_WRITE) && - !(seg->lv->status & LV_TEMPORARY) && + !(seg->lv->status & LV_ACTIVATION_SKIP) && lv_is_visible(seg_lv(seg, s))) raid_seg_error("visible raid image LV"); @@ -252,7 +252,7 @@ static void _check_raid_sublvs(struct lv_segment *seg, int *error_count) if (seg_metatype(seg, s) != AREA_LV) raid_seg_error("no raid meta SubLV"); - else if (!(seg->lv->status & LV_TEMPORARY) && + else if (!(seg->lv->status & LV_ACTIVATION_SKIP) && lv_is_visible(seg_metalv(seg, s))) raid_seg_error("visible raid meta LV"); } diff --git a/tools/lvchange.c b/tools/lvchange.c index a934f522b..ff5b626f4 100644 --- a/tools/lvchange.c +++ b/tools/lvchange.c @@ -388,7 +388,7 @@ static int _lvchange_resync(struct cmd_context *cmd, struct logical_volume *lv) * Now we handle mirrors with log devices */ lv->status &= ~LV_NOTSYNCED; - lv->status |= LV_TEMPORARY; + lv->status |= LV_ACTIVATION_SKIP; /* Separate mirror log or metadata devices so we can clear them */ if (!_detach_metadata_devices(seg, &device_list)) { @@ -424,7 +424,7 @@ static int _lvchange_resync(struct cmd_context *cmd, struct logical_volume *lv) return 0; } - lv->status &= ~LV_TEMPORARY; + lv->status &= ~LV_ACTIVATION_SKIP; if (!_vg_write_commit(lv, NULL)) return 0; diff --git a/tools/lvconvert.c b/tools/lvconvert.c index fb694a149..f5348ef28 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -3143,12 +3143,12 @@ static int _lvconvert_to_pool(struct cmd_context *cmd, goto_bad; if (zero_metadata) { - metadata_lv->status |= LV_TEMPORARY; + metadata_lv->status |= LV_ACTIVATION_SKIP; if (!activate_lv(cmd, metadata_lv)) { log_error("Aborting. Failed to activate metadata lv."); goto bad; } - metadata_lv->status &= ~LV_TEMPORARY; + metadata_lv->status &= ~LV_ACTIVATION_SKIP; if (!wipe_lv(metadata_lv, (struct wipe_params) { .do_zero = 1 })) { log_error("Aborting. Failed to wipe metadata lv."); |