Revert "raid: add _rimage and _rmeta as origin_only"

This reverts commit 3388e194892e9ab7a36b72e512796c2d218dae6e.
More thinking needed.

diff --git a/WHATS_NEW b/WHATS_NEW
index aa3960b3122bdc041abbdf5ee5dc18c14cffacae..1fffbb5d7c5b85daa206cdfa4fa9826afd6cba8a 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -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.

diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
index e98cf578bba65d132d38b7eb8158f7a7fab69313..a626b000ab87def4570bec720945eb5ff97d9390 100644 (file)
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
@@ -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;
                }