From 1419bf1c98df51ce35c8c93182c5075ac2802cf0 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Mon, 3 Oct 2011 18:26:07 +0000 Subject: [PATCH] Transaction_id is property of thin_pool Remove Transaction_id from thin target. Store device_id for thin target. --- lib/thin/thin.c | 2 +- libdm/libdevmapper.h | 1 - libdm/libdm-deptree.c | 3 ++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/thin/thin.c b/lib/thin/thin.c index 8d6f474df..bf05e7e62 100644 --- a/lib/thin/thin.c +++ b/lib/thin/thin.c @@ -199,7 +199,7 @@ static int _thin_add_target_line(struct dev_manager *dm, return 0; } - if (!dm_tree_node_add_thin_target(node, len, 0, thin_pool_dlid, seg->device_id)) + if (!dm_tree_node_add_thin_target(node, len, thin_pool_dlid, seg->device_id)) return_0; return 1; diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index 499992b6b..9924eb67c 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -547,7 +547,6 @@ int dm_tree_node_add_thin_pool_target(struct dm_tree_node *node, int dm_tree_node_add_thin_target(struct dm_tree_node *node, uint64_t size, - uint64_t transation_id, const char *thin_pool_uuid, uint32_t device_id); diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index dc436b095..1476964a3 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -2690,7 +2690,6 @@ int dm_tree_node_add_thin_pool_target(struct dm_tree_node *node, int dm_tree_node_add_thin_target(struct dm_tree_node *node, uint64_t size, - uint64_t transation_id, const char *thin_pool_uuid, uint32_t device_id) { @@ -2713,6 +2712,8 @@ int dm_tree_node_add_thin_target(struct dm_tree_node *node, if (!_link_tree_nodes(node, seg->pool)) return_0; + seg->device_id = device_id; + return 1; }