1
0
mirror of git://sourceware.org/git/lvm2.git synced 2025-04-01 18:50:41 +03:00

Revert "raid: add _rimage and _rmeta as origin_only"

This reverts commit 3388e194892e9ab7a36b72e512796c2d218dae6e.
More thinking needed.
This commit is contained in:
Zdenek Kabelac 2020-09-09 00:58:52 +02:00
parent a8ea1817ab
commit af33a00847
2 changed files with 2 additions and 4 deletions

View File

@ -1,6 +1,5 @@
Version 2.03.11 -
==================================
Use _rmeta and _rimage as origin only devices for table loading.
Switch code base to use flexible array syntax.
Fix 64bit math when calculation cachevol size.
Preserve uint32_t for seqno handling.

View File

@ -2642,11 +2642,10 @@ static int _add_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
/* origin only for cache without pending delete */
(!dm->track_pending_delete || !lv_is_cache(lv)) &&
!_add_lv_to_dtree(dm, dtree, seg_lv(seg, s),
(lv_is_vdo_pool(seg_lv(seg, s)) ||
lv_is_raid_image(seg_lv(seg, s))) ? 1 : 0))
lv_is_vdo_pool(seg_lv(seg, s)) ? 1 : 0))
return_0;
if (seg_is_raid_with_meta(seg) && seg->meta_areas && seg_metalv(seg, s) &&
!_add_lv_to_dtree(dm, dtree, seg_metalv(seg, s), 1))
!_add_lv_to_dtree(dm, dtree, seg_metalv(seg, s), 0))
return_0;
}