From: Marian Csontos <mcsontos@redhat.com>
Date: Mon, 21 Oct 2019 14:31:53 +0000 (+0200)
Subject: dm: fix compilation of dmsetup
X-Git-Tag: v2_03_06~6
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=3e01ff2783505f9b64f273fb492ee88e26afb568;p=lvm2.git

dm: fix compilation of dmsetup

Fix: 889c88e9dab33195efc4dc0400a4b0aaa3383948
Use correct enum DM_DEVICE_GET_TARGET_VERSION.
---

diff --git a/WHATS_NEW b/WHATS_NEW
index 001a12bf3..11b0acf5e 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -12,7 +12,7 @@ Version 2.03.06 -
   Preserve VDO write policy with vdopool.
   Increase default vdo bio threads to 4.
   Continue report when cache_status fails.
-  Add support for DM_GET_TARGET_VERSION into device_mapper.
+  Add support for DM_DEVICE_GET_TARGET_VERSION into device_mapper.
   Fix cmirrord usage of header files from device_mapper subdir.
   Allow standalone activation of VDO pool just like for thin-pools.
   Activate thin-pool layered volume as 'read-only' device.
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 94492d4b2..ed56b89ab 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,6 +1,6 @@
 Version 1.02.165 - 
 =================================
-  Add support for DM_GET_TARGET_VERSION.
+  Add support for DM_DEVICE_GET_TARGET_VERSION.
   Add debug of dmsetup udevcomplete with hexa print DM_COOKIE_COMPLETED.
   Fix versioning of dm_stats_create_region and dm_stats_create_region.
 
diff --git a/device_mapper/all.h b/device_mapper/all.h
index 52b546f1f..57673b44a 100644
--- a/device_mapper/all.h
+++ b/device_mapper/all.h
@@ -123,7 +123,7 @@ enum {
 
 	DM_DEVICE_ARM_POLL,
 
-	DM_GET_TARGET_VERSION
+	DM_DEVICE_GET_TARGET_VERSION
 };
 
 /*
diff --git a/libdm/dm-tools/dmsetup.c b/libdm/dm-tools/dmsetup.c
index 7d60d2f1b..269f86c9b 100644
--- a/libdm/dm-tools/dmsetup.c
+++ b/libdm/dm-tools/dmsetup.c
@@ -2596,7 +2596,7 @@ static int _target_version(CMD_ARGS)
 	struct dm_task *dmt;
 	struct dm_versions *target;
 
-	if (!(dmt = dm_task_create(DM_GET_TARGET_VERSION)))
+	if (!(dmt = dm_task_create(DM_DEVICE_GET_TARGET_VERSION)))
 		return_0;
 
 	if (!dm_task_set_name(dmt, argv[0]))
diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h
index 81c67dcf2..18fe9f9fd 100644
--- a/libdm/libdevmapper.h
+++ b/libdm/libdevmapper.h
@@ -123,7 +123,7 @@ enum {
 
 	DM_DEVICE_ARM_POLL,
 
-	DM_GET_TARGET_VERSION
+	DM_DEVICE_GET_TARGET_VERSION
 };
 
 /*