From 9a88a9c4ce8fc930328e8d7d56fae8e964f8df02 Mon Sep 17 00:00:00 2001 From: David Teigland Date: Fri, 28 Aug 2020 13:26:50 -0500 Subject: Revert "lvdisplay: dispaly correct status when underlying devs missing" This reverts commit 1d0dc74f9147e3c1f3681efa4166cbe2edcb6571. We should avoid adding anything new to lvdisplay and report new information via lvs reporting fields. --- lib/raid/raid.c | 54 ------------------------------------------------------ 1 file changed, 54 deletions(-) (limited to 'lib/raid') diff --git a/lib/raid/raid.c b/lib/raid/raid.c index 4ed77e9a8..e88a15408 100644 --- a/lib/raid/raid.c +++ b/lib/raid/raid.c @@ -25,60 +25,6 @@ #include "lib/metadata/metadata.h" #include "lib/metadata/lv_alloc.h" -/* - * below case think as available, return true: - * - raid 1: at least 1 disk live - * - raid 10: loose 1 disk - * - raid 4/5: loose 1 disk - * - raid 6: loose 2 disk - * - * raid 0: if there is any disk loose, return false - * */ -bool raid_is_available(const struct logical_volume *lv) -{ - int s, missing_pv = 0, exist_pv = 0; - bool ret = true; - struct lv_segment *seg = NULL; - - dm_list_iterate_items(seg, &lv->segments) { - for (s = 0; s < seg->area_count; ++s) { - if (seg_type(seg, s) == AREA_LV) { - if (seg_lv(seg, s)->status & PARTIAL_LV) - missing_pv++; - else - exist_pv++; - } - } - } - if (seg_is_any_raid0(first_seg(lv))){ - ret = missing_pv ? false : true; - goto out; - } - if (seg_is_raid1(first_seg(lv))){ - ret = exist_pv ? true : false; - goto out; - } - if (seg_is_any_raid10(first_seg(lv))) { - ret = (missing_pv > 1) ? false : true; - goto out; - } - if (seg_is_raid4(first_seg(lv))) { - ret = (missing_pv > 1) ? false : true; - goto out; - } - if (seg_is_any_raid5(first_seg(lv))) { - ret = (missing_pv > 1) ? false : true; - goto out; - } - if (seg_is_any_raid6(first_seg(lv))) { - ret = (missing_pv > 2) ? false : true; - goto out; - } - -out: - return ret; -} - static int _raid_target_present(struct cmd_context *cmd, const struct lv_segment *seg __attribute__((unused)), unsigned *attributes); -- cgit v1.2.1