Thin api change for dm_tree_node_add_thin_target

A little code shuffling and adding support for
DM_THIN_ERROR_DEVICE_ID which might be eventually be used
for activation of thin which is going to be deleted.
For now we do not need it lvm.

diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h
index 3f730adae043e33708e6f475a1dd540d2d2c9f4e..1399c35707ce9d82cec9c93794fa0685c858bf52 100644 (file)
--- a/libdm/libdevmapper.h
+++ b/libdm/libdevmapper.h
@@ -540,11 +540,9 @@ int dm_tree_node_add_replicator_dev_target(struct dm_tree_node *node,
  * FIXME: Defines bellow are based on kernel's dm-thin.c defines
  * DATA_DEV_BLOCK_SIZE_MIN_SECTORS (64 * 1024 >> SECTOR_SHIFT)
  * DATA_DEV_BLOCK_SIZE_MAX_SECTORS (1024 * 1024 * 1024 >> SECTOR_SHIFT)
- * MAX_DEV_ID ((1 << 24) - 1)
  */
 #define DM_THIN_MIN_DATA_BLOCK_SIZE (UINT32_C(128))
 #define DM_THIN_MAX_DATA_BLOCK_SIZE (UINT32_C(2097152))
-#define DM_THIN_MAX_DEVICE_ID (UINT32_C((1 << 24) - 1))
 
 int dm_tree_node_add_thin_pool_target(struct dm_tree_node *node,
                                      uint64_t size,
@@ -591,9 +589,18 @@ struct dm_thin_message {
 int dm_tree_node_add_thin_pool_message(struct dm_tree_node *node,
                                        const struct dm_thin_message *message);
 
+/*
+ * FIXME: Defines bellow are based on kernel's dm-thin.c defines
+ * 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 *thin_pool_uuid,
+                                const char *pool_uuid,
                                 uint32_t device_id);
 
 void dm_tree_node_set_udev_flags(struct dm_tree_node *node, uint16_t udev_flags);

diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index 7768261eafb6a13ff6b2452d05c46b0a29b01044..2baf82fdc3a1f6f9dc435f16c0fa89fe669b3322 100644 (file)
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
@@ -2973,26 +2973,33 @@ int dm_tree_node_add_thin_pool_message(struct dm_tree_node *node,
 
 int dm_tree_node_add_thin_target(struct dm_tree_node *node,
                                 uint64_t size,
-                                const char *thin_pool_uuid,
+                                const char *pool_uuid,
                                 uint32_t device_id)
 {
+       struct dm_tree_node *pool;
        struct load_segment *seg;
 
-       if (!_thin_validate_device_id(device_id))
-               return_0;
-
-       if (!(seg = _add_segment(node, SEG_THIN, size)))
-               return_0;
-
-       if (!(seg->pool = dm_tree_find_node_by_uuid(node->dtree, thin_pool_uuid))) {
-               log_error("Missing thin pool uuid %s.", thin_pool_uuid);
+       if (!(pool = dm_tree_find_node_by_uuid(node->dtree, pool_uuid))) {
+               log_error("Missing thin pool uuid %s.", pool_uuid);
                return 0;
        }
 
-       if (!_link_tree_nodes(node, seg->pool))
+       if (!_link_tree_nodes(node, pool))
                return_0;
 
-       seg->device_id = device_id;
+       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 (!(seg = _add_segment(node, SEG_THIN, size)))
+                       return_0;
+
+               seg->pool = pool;
+               seg->device_id = device_id;
+       }
 
        return 1;
 }