Blame SOURCES/lvm2-2_02_186-cache-support-no_discard_passdown.patch

ed3f07
 WHATS_NEW             | 1 +
ed3f07
 WHATS_NEW_DM          | 4 ++++
ed3f07
 lib/metadata/lv.c     | 5 +++++
ed3f07
 libdm/libdevmapper.h  | 1 +
ed3f07
 libdm/libdm-targets.c | 2 ++
ed3f07
 5 files changed, 13 insertions(+)
ed3f07
ed3f07
diff --git a/WHATS_NEW b/WHATS_NEW
ed3f07
index 106661f..d3da403 100644
ed3f07
--- a/WHATS_NEW
ed3f07
+++ b/WHATS_NEW
ed3f07
@@ -1,5 +1,6 @@
ed3f07
 Version 2.02.186 - 
ed3f07
 ================================
ed3f07
+  Report no_discard_passdown for cache LVs with lvs -o+kernel_discards.
ed3f07
   Prevent shared active mirror LVs with lvmlockd.
ed3f07
 
ed3f07
 Version 2.02.185 - 13th May 2019
ed3f07
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
ed3f07
index 7c74bfe..8c78724 100644
ed3f07
--- a/WHATS_NEW_DM
ed3f07
+++ b/WHATS_NEW_DM
ed3f07
@@ -1,3 +1,7 @@
ed3f07
+Version 1.02.160 - 
ed3f07
+================================
ed3f07
+  Parsing of cache status understand no_discard_passdown.
ed3f07
+
ed3f07
 Version 1.02.158 - 13th May 2019
ed3f07
 ================================
ed3f07
 
ed3f07
diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c
ed3f07
index 2abe42d..538b292 100644
ed3f07
--- a/lib/metadata/lv.c
ed3f07
+++ b/lib/metadata/lv.c
ed3f07
@@ -245,6 +245,11 @@ char *lvseg_kernel_discards_dup_with_info_and_seg_status(struct dm_pool *mem, co
ed3f07
 			return 0;
ed3f07
 		}
ed3f07
 		s = get_pool_discards_name(d);
ed3f07
+	} else if (lvdm->seg_status.type == SEG_STATUS_CACHE) {
ed3f07
+		if (lvdm->seg_status.cache->feature_flags &
ed3f07
+		    DM_CACHE_FEATURE_NO_DISCARD_PASSDOWN) {
ed3f07
+			s = "nopassdown";
ed3f07
+		}
ed3f07
 	}
ed3f07
 
ed3f07
 	if (!(ret = dm_pool_strdup(mem, s))) {
ed3f07
diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h
ed3f07
index 19032d7..e885f52 100644
ed3f07
--- a/libdm/libdevmapper.h
ed3f07
+++ b/libdm/libdevmapper.h
ed3f07
@@ -1893,6 +1893,7 @@ int dm_tree_node_add_raid_target_with_params_v2(struct dm_tree_node *node,
ed3f07
 #define DM_CACHE_FEATURE_WRITETHROUGH 0x00000002
ed3f07
 #define DM_CACHE_FEATURE_PASSTHROUGH  0x00000004
ed3f07
 #define DM_CACHE_FEATURE_METADATA2    0x00000008 /* cache v1.10 */
ed3f07
+#define DM_CACHE_FEATURE_NO_DISCARD_PASSDOWN 0x00000010
ed3f07
 
ed3f07
 struct dm_config_node;
ed3f07
 /*
ed3f07
diff --git a/libdm/libdm-targets.c b/libdm/libdm-targets.c
ed3f07
index 8766789..d0a8b43 100644
ed3f07
--- a/libdm/libdm-targets.c
ed3f07
+++ b/libdm/libdm-targets.c
ed3f07
@@ -296,6 +296,8 @@ int dm_get_status_cache(struct dm_pool *mem, const char *params,
ed3f07
 			s->feature_flags |= DM_CACHE_FEATURE_PASSTHROUGH;
ed3f07
 		else if (!strncmp(p, "metadata2 ", 10))
ed3f07
 			s->feature_flags |= DM_CACHE_FEATURE_METADATA2;
ed3f07
+		else if (!strncmp(p, "no_discard_passdown ", 20))
ed3f07
+			s->feature_flags |= DM_CACHE_FEATURE_NO_DISCARD_PASSDOWN;
ed3f07
 		else
ed3f07
 			log_error("Unknown feature in status: %s", params);
ed3f07