pool/lvm2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 809718 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/809718
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lvm2?expand=0&rev=136
This commit is contained in:
Dominique Leuenberger 2020-06-03 18:28:42 +00:00 committed by Git OBS Bridge
commit 679de0d0d1
3 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
bug-1171907-lvremove-remove-attached-cachevol-with-removed-LV.patch Normal file
View File

@ -0,0 +1,41 @@
change this patch
from: if (!lv_detach_cache_vol(lv, 0)) {
to : if (!lv_detach_cache_vol(lv)) {
by heming.zhao@suse.com
---
From 56aadd7fe2a1d24043ea9d06543c29317ac1cc58 Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Tue, 24 Sep 2019 13:46:40 -0500
Subject: [PATCH] lvremove: remove attached cachevol with removed LV
When an LV is removed that has an attached cachevol,
also remove the cachevol LV.
---
lib/metadata/lv_manip.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 79e3d15..f404555 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -6283,10 +6283,16 @@ int lv_remove_single(struct cmd_context *cmd, struct logical_volume *lv,
return_0;
if (lv_is_cache(lv) && lv_is_cache_vol(first_seg(lv)->pool_lv)) {
+ struct logical_volume *cachevol_lv = first_seg(lv)->pool_lv;
+
if (!lv_detach_cache_vol(lv)) {
log_error("Failed to detach cache from %s", display_lvname(lv));
return 0;
}
+ if (!lv_remove_single(cmd, cachevol_lv, force, suppress_remove_message)) {
+ log_error("Failed to remove cachevol %s.", display_lvname(cachevol_lv));
+ return 0;
+ }
}
/* FIXME Ensure not referred to by another existing LVs */
--
1.8.3.1

6
lvm2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed May 27 13:00:58 UTC 2020 - heming.zhao@suse.com
- removing LVM cache with cache volume does not remove the cache volume (bsc#1171907)
+ bug-1171907-lvremove-remove-attached-cachevol-with-removed-LV.patch
-------------------------------------------------------------------
Wed May 13 03:45:38 UTC 2020 - heming.zhao@suse.com

2
lvm2.spec
View File

@ -93,6 +93,7 @@ Patch0035: bug-1150021_04-bcache-add-unit-test.patch
Patch0036: bug-1150021_05-bcache-bcache_invalidate_fd-only-remove-prefixes-on.patch
Patch0037: bug-1150021_06-fix-dev_unset_last_byte-after-write-error.patch
Patch0038: bug-1157736-add-suggestion-message-for-mirror-LVs.patch
Patch0039: bug-1171907-lvremove-remove-attached-cachevol-with-removed-LV.patch
# SUSE patches: 1000+ for LVM
# Never upstream
Patch1001: cmirrord_remove_date_time_from_compilation.patch
@ -185,6 +186,7 @@ Volume Manager.
%patch0036 -p1
%patch0037 -p1
%patch0038 -p1
%patch0039 -p1
%patch1001 -p1
%patch1002 -p1
%patch1003 -p1