88 lines
2.7 KiB
Diff
88 lines
2.7 KiB
Diff
|
From 7702262444a5af924d0fc94ff956663aab3505df Mon Sep 17 00:00:00 2001
|
||
|
|
From: David Teigland <teigland@redhat.com>
|
||
|
|
Date: Tue, 2 May 2023 16:12:23 -0500
|
||
|
|
Subject: [PATCH 6/8] lvreduce: make _lvseg_get_stripes handle integrity layer
|
||
|
|
|
||
|
|
lvreduce uses _lvseg_get_stripes() which was unable to get raid stripe
|
||
|
|
info with an integrity layer present. This caused lvreduce on a
|
||
|
|
raid+integrity LV to fail prematurely when checking stripe parameters.
|
||
|
|
An unhelpful error message about stripe size would be printed.
|
||
|
|
|
||
|
|
(cherry picked from commit 368381fd4022dc99ffe551b30ed75c3ddbc5c5c8)
|
||
|
|
---
|
||
|
|
lib/metadata/lv_manip.c | 35 ++++++++++++++++++++++++++---------
|
||
|
|
1 file changed, 26 insertions(+), 9 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
|
||
|
|
index 2a4e0e88a..add9512ff 100644
|
||
|
|
--- a/lib/metadata/lv_manip.c
|
||
|
|
+++ b/lib/metadata/lv_manip.c
|
||
|
|
@@ -5144,22 +5144,39 @@ int lv_extend_policy_calculate_percent(struct logical_volume *lv,
|
||
|
|
|
||
|
|
static uint32_t _lvseg_get_stripes(struct lv_segment *seg, uint32_t *stripesize)
|
||
|
|
{
|
||
|
|
- uint32_t s;
|
||
|
|
- struct lv_segment *seg_mirr;
|
||
|
|
+ uint32_t s, a;
|
||
|
|
+ struct lv_segment *seg_get, *seg_image, *seg_iorig;
|
||
|
|
+ struct logical_volume *lv_image, *lv_iorig;
|
||
|
|
|
||
|
|
/* If segment mirrored, check if images are striped */
|
||
|
|
- if (seg_is_mirrored(seg))
|
||
|
|
+ if (seg_is_mirrored(seg)) {
|
||
|
|
for (s = 0; s < seg->area_count; s++) {
|
||
|
|
if (seg_type(seg, s) != AREA_LV)
|
||
|
|
continue;
|
||
|
|
- seg_mirr = first_seg(seg_lv(seg, s));
|
||
|
|
|
||
|
|
- if (seg_is_striped(seg_mirr)) {
|
||
|
|
- seg = seg_mirr;
|
||
|
|
+ lv_image = seg_lv(seg, s);
|
||
|
|
+ seg_image = first_seg(lv_image);
|
||
|
|
+ seg_get = NULL;
|
||
|
|
+
|
||
|
|
+ if (seg_is_integrity(seg_image)) {
|
||
|
|
+ /* Get stripe values from the iorig layer. */
|
||
|
|
+ for (a = 0; a < seg_image->area_count; a++) {
|
||
|
|
+ lv_iorig = seg_lv(seg_image, a);
|
||
|
|
+ seg_iorig = first_seg(lv_iorig);
|
||
|
|
+ seg_get = seg_iorig;
|
||
|
|
+ break;
|
||
|
|
+ }
|
||
|
|
+ } else {
|
||
|
|
+ /* Get stripe values from the image layer. */
|
||
|
|
+ seg_get = seg_image;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ if (seg_get && seg_is_striped(seg_get)) {
|
||
|
|
+ seg = seg_get;
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
-
|
||
|
|
+ }
|
||
|
|
|
||
|
|
if (seg_is_striped(seg)) {
|
||
|
|
*stripesize = seg->stripe_size;
|
||
|
|
@@ -5168,7 +5185,7 @@ static uint32_t _lvseg_get_stripes(struct lv_segment *seg, uint32_t *stripesize)
|
||
|
|
|
||
|
|
if (seg_is_raid(seg)) {
|
||
|
|
*stripesize = seg->stripe_size;
|
||
|
|
- return _raid_stripes_count(seg);
|
||
|
|
+ return _raid_stripes_count(seg);
|
||
|
|
}
|
||
|
|
|
||
|
|
*stripesize = 0;
|
||
|
|
@@ -5593,7 +5610,7 @@ static int _lvresize_adjust_extents(struct logical_volume *lv,
|
||
|
|
seg_size /= seg_mirrors;
|
||
|
|
lp->extents = logical_extents_used + seg_size;
|
||
|
|
break;
|
||
|
|
- }
|
||
|
|
+ }
|
||
|
|
} else if (new_extents <= logical_extents_used + seg_logical_extents) {
|
||
|
|
seg_size = new_extents - logical_extents_used;
|
||
|
|
lp->extents = new_extents;
|
||
|
|
--
|
||
|
|
2.40.1
|
||
|
|
|