|
 |
38b7b2 |
From 45a2ccfa3bdf4c5b3f8b9e0cc5330fca345b0d26 Mon Sep 17 00:00:00 2001
|
|
|
38b7b2 |
From: Peter Rajnoha <prajnoha@redhat.com>
|
|
|
38b7b2 |
Date: Thu, 5 May 2022 11:02:32 +0200
|
|
|
38b7b2 |
Subject: [PATCH 48/54] toollib: fix segfault when handling selection with
|
|
|
38b7b2 |
historical LVs
|
|
|
38b7b2 |
|
|
|
38b7b2 |
When processing historical LVs inside process_each_lv_in_vg for
|
|
|
38b7b2 |
selection, we need to use dummy "_historical_lv" for select_match_lv.
|
|
|
38b7b2 |
|
|
|
38b7b2 |
This is because a historical LV is not an actual LV, but only a tiny
|
|
|
38b7b2 |
representation with subset of original properties that we recorded
|
|
|
38b7b2 |
(name, uuid...).
|
|
|
38b7b2 |
|
|
|
38b7b2 |
To use the same processing functions we use for full-fledged non-historical
|
|
|
38b7b2 |
LVs, we need to use the prefilled "_historical_lv" structure which has all
|
|
|
38b7b2 |
the other missing properties hard-coded.
|
|
|
38b7b2 |
---
|
|
|
38b7b2 |
tools/toollib.c | 7 ++++---
|
|
|
38b7b2 |
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
38b7b2 |
|
|
|
38b7b2 |
diff --git a/tools/toollib.c b/tools/toollib.c
|
|
|
38b7b2 |
index 697baee82..01ba03658 100644
|
|
|
38b7b2 |
--- a/tools/toollib.c
|
|
|
38b7b2 |
+++ b/tools/toollib.c
|
|
|
38b7b2 |
@@ -3392,13 +3392,14 @@ int process_each_lv_in_vg(struct cmd_context *cmd, struct volume_group *vg,
|
|
|
38b7b2 |
process_lv = 1;
|
|
|
38b7b2 |
}
|
|
|
38b7b2 |
|
|
|
38b7b2 |
- process_lv = process_lv && select_match_lv(cmd, handle, vg, lvl->lv) && _select_matches(handle);
|
|
|
38b7b2 |
+ _historical_lv.this_glv = glvl->glv;
|
|
|
38b7b2 |
+ _historical_lv.name = glvl->glv->historical->name;
|
|
|
38b7b2 |
+
|
|
|
38b7b2 |
+ process_lv = process_lv && select_match_lv(cmd, handle, vg, &_historical_lv) && _select_matches(handle);
|
|
|
38b7b2 |
|
|
|
38b7b2 |
if (!process_lv)
|
|
|
38b7b2 |
continue;
|
|
|
38b7b2 |
|
|
|
38b7b2 |
- _historical_lv.this_glv = glvl->glv;
|
|
|
38b7b2 |
- _historical_lv.name = glvl->glv->historical->name;
|
|
|
38b7b2 |
log_very_verbose("Processing historical LV %s in VG %s.", glvl->glv->historical->name, vg->name);
|
|
|
38b7b2 |
|
|
|
38b7b2 |
ret = process_single_lv(cmd, &_historical_lv, handle);
|
|
|
38b7b2 |
--
|
|
|
38b7b2 |
2.34.3
|
|
|
38b7b2 |
|