78da9a698d
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/lvm2.git#d2cc5b0434310d77f9ef21e3da5220677753e81e
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
lib/metadata/writecache_manip.c | 10 +++++++---
|
|
tools/lvconvert.c | 2 ++
|
|
2 files changed, 9 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/lib/metadata/writecache_manip.c b/lib/metadata/writecache_manip.c
|
|
index 5004aa9..8150d07 100644
|
|
--- a/lib/metadata/writecache_manip.c
|
|
+++ b/lib/metadata/writecache_manip.c
|
|
@@ -75,7 +75,7 @@ static int _get_writecache_kernel_status(struct cmd_context *cmd,
|
|
return 0;
|
|
}
|
|
|
|
- if (!lv_info_with_seg_status(cmd, first_seg(lv), &status, 1, 1)) {
|
|
+ if (!lv_info_with_seg_status(cmd, first_seg(lv), &status, 0, 0)) {
|
|
log_error("Failed to get device mapper status for %s", display_lvname(lv));
|
|
goto fail;
|
|
}
|
|
@@ -434,8 +434,12 @@ int lv_writecache_set_cleaner(struct logical_volume *lv)
|
|
seg->writecache_settings.cleaner_set = 1;
|
|
|
|
if (lv_is_active(lv)) {
|
|
- if (!lv_update_and_reload(lv)) {
|
|
- log_error("Failed to update VG and reload LV.");
|
|
+ if (!vg_write(lv->vg) || !vg_commit(lv->vg)) {
|
|
+ log_error("Failed to update VG.");
|
|
+ return 0;
|
|
+ }
|
|
+ if (!lv_writecache_message(lv, "cleaner")) {
|
|
+ log_error("Failed to set writecache cleaner for %s.", display_lvname(lv));
|
|
return 0;
|
|
}
|
|
} else {
|
|
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
|
|
index 4323965..7b74afb 100644
|
|
--- a/tools/lvconvert.c
|
|
+++ b/tools/lvconvert.c
|
|
@@ -5720,6 +5720,8 @@ static int _lvconvert_detach_writecache_when_clean(struct cmd_context *cmd,
|
|
return 0;
|
|
}
|
|
|
|
+ log_debug("detach writecache check clean reading vg %s", id->vg_name);
|
|
+
|
|
vg = vg_read(cmd, id->vg_name, NULL, READ_FOR_UPDATE, lockd_state, &error_flags, NULL);
|
|
|
|
if (!vg) {
|