|
 |
b83e05 |
lib/activate/dev_manager.c | 11 ++++++++++-
|
|
|
b83e05 |
1 file changed, 10 insertions(+), 1 deletion(-)
|
|
|
b83e05 |
|
|
|
b83e05 |
diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
|
|
|
b83e05 |
index 56608e3..a5e026c 100644
|
|
|
b83e05 |
--- a/lib/activate/dev_manager.c
|
|
|
b83e05 |
+++ b/lib/activate/dev_manager.c
|
|
|
b83e05 |
@@ -1592,6 +1592,9 @@ int dev_manager_thin_percent(struct dev_manager *dm,
|
|
|
b83e05 |
return 1;
|
|
|
b83e05 |
}
|
|
|
b83e05 |
|
|
|
b83e05 |
+/*
|
|
|
b83e05 |
+ * Explore state of running DM table to obtain currently used deviceId
|
|
|
b83e05 |
+ */
|
|
|
b83e05 |
int dev_manager_thin_device_id(struct dev_manager *dm,
|
|
|
b83e05 |
const struct logical_volume *lv,
|
|
|
b83e05 |
uint32_t *device_id)
|
|
|
b83e05 |
@@ -1601,10 +1604,16 @@ int dev_manager_thin_device_id(struct dev_manager *dm,
|
|
|
b83e05 |
struct dm_info info;
|
|
|
b83e05 |
uint64_t start, length;
|
|
|
b83e05 |
char *params, *target_type = NULL;
|
|
|
b83e05 |
+ const char *layer = lv_layer(lv);
|
|
|
b83e05 |
int r = 0;
|
|
|
b83e05 |
|
|
|
b83e05 |
+ if (lv_is_merging_origin(lv) && !lv_info(lv->vg->cmd, lv, 1, NULL, 0, 0))
|
|
|
b83e05 |
+ /* If the merge has already happened, that table
|
|
|
b83e05 |
+ * can already be using correct LV without -real layer */
|
|
|
b83e05 |
+ layer = NULL;
|
|
|
b83e05 |
+
|
|
|
b83e05 |
/* Build dlid for the thin layer */
|
|
|
b83e05 |
- if (!(dlid = build_dm_uuid(dm->mem, lv, lv_layer(lv))))
|
|
|
b83e05 |
+ if (!(dlid = build_dm_uuid(dm->mem, lv, layer)))
|
|
|
b83e05 |
return_0;
|
|
|
b83e05 |
|
|
|
b83e05 |
if (!(dmt = _setup_task_run(DM_DEVICE_TABLE, &info, NULL, dlid, 0, 0, 0, 0, 1, 0)))
|