mrc0mmand / rpms / lvm2

Forked from rpms/lvm2 2 years ago
Clone

Blame SOURCES/lvm2-2_02_182-cache-drop-metadata_format-validation.patch

0d8a0a
 WHATS_NEW                  | 4 ++++
0d8a0a
 lib/metadata/cache_manip.c | 5 -----
0d8a0a
 2 files changed, 4 insertions(+), 5 deletions(-)
0d8a0a
0d8a0a
diff --git a/WHATS_NEW b/WHATS_NEW
0d8a0a
index 546d3e6..17aff08 100644
0d8a0a
--- a/WHATS_NEW
0d8a0a
+++ b/WHATS_NEW
0d8a0a
@@ -1,3 +1,7 @@
0d8a0a
+Version 2.02.182 - 
0d8a0a
+==============================
0d8a0a
+  Do not pair cache policy and cache metadata format.
0d8a0a
+
0d8a0a
 Version 2.02.181 - 
0d8a0a
 =================================
0d8a0a
   Reject conversions on raid1 LVs with split tracked SubLVs.
0d8a0a
diff --git a/lib/metadata/cache_manip.c b/lib/metadata/cache_manip.c
0d8a0a
index c15f117..8376bfb 100644
0d8a0a
--- a/lib/metadata/cache_manip.c
0d8a0a
+++ b/lib/metadata/cache_manip.c
0d8a0a
@@ -843,15 +843,10 @@ int cache_set_metadata_format(struct lv_segment *seg, cache_metadata_format_t fo
0d8a0a
 
0d8a0a
 	/*
0d8a0a
 	 * If policy is unselected, but format 2 is selected, policy smq is enforced.
0d8a0a
-	 * ATM no other then smq & cleaner policy is allowed to select format 2.
0d8a0a
 	 */
0d8a0a
 	if (!seg->policy_name) {
0d8a0a
 		if (format == CACHE_METADATA_FORMAT_2)
0d8a0a
 			seg->policy_name = "smq";
0d8a0a
-	} else if (strcmp(seg->policy_name, "smq") &&
0d8a0a
-		   strcmp(seg->policy_name, "cleaner")) {
0d8a0a
-		seg->cache_metadata_format = CACHE_METADATA_FORMAT_1;
0d8a0a
-		return 1;
0d8a0a
 	}
0d8a0a
 
0d8a0a
 	/* Check if we need to search for configured cache metadata format */