mrc0mmand / rpms / lvm2

Forked from rpms/lvm2 2 years ago
Clone

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

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