From 6744c143a5cc2ec8060364d0238f6a4867a12a93 Mon Sep 17 00:00:00 2001
From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Sat, 12 Nov 2011 22:44:10 +0000
Subject: [PATCH] Thin remove unused define

Remove DM_THIN_ERROR_DEVICE_ID from API.
Remove API warning.
Drop code that was using DM_THIN_ERROR_DEVICE_ID (already commented)
Remove debug message which slipped in through some previous commit.
---
 lib/thin/thin.c       |  2 --
 libdm/libdevmapper.h  |  5 -----
 libdm/libdm-deptree.c | 17 ++++++-----------
 tools/lvm.c           |  1 -
 tools/toollib.c       |  1 -
 5 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/lib/thin/thin.c b/lib/thin/thin.c
index 17f49c9d6..4a40d2743 100644
--- a/lib/thin/thin.c
+++ b/lib/thin/thin.c
@@ -230,8 +230,6 @@ static int _thin_pool_add_target_line(struct dev_manager *dm,
 			return 0;
 		}
 
-		//if (!dm_tree_node_add_thin_target(node, len, pool_dlid,
-		//				    DM_THIN_ERROR_DEVICE_ID))
 		if (!dm_tree_node_add_linear_target(node, len) ||
 		    !dm_tree_node_add_target_area(node, NULL, pool_dlid, 0))
 			return_0;
diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h
index c865f6fd6..464c867f7 100644
--- a/libdm/libdevmapper.h
+++ b/libdm/libdevmapper.h
@@ -535,7 +535,6 @@ int dm_tree_node_add_replicator_dev_target(struct dm_tree_node *node,
 					   uint32_t slog_region_size);
 /* End of Replicator API */
 
-/* API for thin provisioning is experimental, DO NOT USE. */
 /*
  * FIXME: Defines bellow are based on kernel's dm-thin.c defines
  * DATA_DEV_BLOCK_SIZE_MIN_SECTORS (64 * 1024 >> SECTOR_SHIFT)
@@ -571,10 +570,6 @@ int dm_tree_node_add_thin_pool_message(struct dm_tree_node *node,
  * MAX_DEV_ID ((1 << 24) - 1)
  */
 #define DM_THIN_MAX_DEVICE_ID (UINT32_C((1 << 24) - 1))
-/* Reserved device_id for error (deleted) thin device */
-// FIXME - only needed for in-delete thin is not activated
-#define DM_THIN_ERROR_DEVICE_ID (UINT32_MAX)
-
 int dm_tree_node_add_thin_target(struct dm_tree_node *node,
 				 uint64_t size,
 				 const char *pool_uuid,
diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index 8c148a32c..9beb792aa 100644
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
@@ -3018,19 +3018,14 @@ int dm_tree_node_add_thin_target(struct dm_tree_node *node,
 	if (!_link_tree_nodes(node, pool))
 		return_0;
 
-	if (device_id == DM_THIN_ERROR_DEVICE_ID) {
-		if (!dm_tree_node_add_error_target(node, size))
-			return_0;
-	} else {
-		if (!_thin_validate_device_id(device_id))
-			return_0;
+	if (!_thin_validate_device_id(device_id))
+		return_0;
 
-		if (!(seg = _add_segment(node, SEG_THIN, size)))
-			return_0;
+	if (!(seg = _add_segment(node, SEG_THIN, size)))
+		return_0;
 
-		seg->pool = pool;
-		seg->device_id = device_id;
-	}
+	seg->pool = pool;
+	seg->device_id = device_id;
 
 	return 1;
 }
diff --git a/tools/lvm.c b/tools/lvm.c
index cec9f8060..f94c685b2 100644
--- a/tools/lvm.c
+++ b/tools/lvm.c
@@ -167,7 +167,6 @@ static void _read_history(struct cmd_context *cmd)
 
 	stifle_history(find_config_tree_int(cmd, "shell/history_size",
 				       DEFAULT_MAX_HISTORY));
-
 }
 
 static void _write_history(void)
diff --git a/tools/toollib.c b/tools/toollib.c
index b9c4d6a65..aba52dc2d 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -329,7 +329,6 @@ int process_each_lv(struct cmd_context *cmd, int argc, char **argv,
 		dm_list_iterate_items(sll, &arg_lvnames) {
 			const char *vg_name = sll->str;
 			const char *lv_name = strchr(vg_name, '/');
-log_error("VGNAME strdup %p %s   %s", lv_name, vg_name,  vgname);
 
 			if ((!lv_name && !strcmp(vg_name, vgname))) {
 				/* Process all LVs in this VG */
-- 
2.43.5