shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-11 20:58:50 +03:00
Code Releases Activity

snapshot: correctly check device id of merged thin

Browse Source 
When checking device id of a thin device that is just being
merged - the snapshot actually could have been already finished
which means  '-real' suffix for the LV is already gone and just LV
is there - so check explicitely for this condition and use
correct UUID for this case.
This commit is contained in:
Zdenek Kabelac 2019-10-25 23:31:08 +02:00
parent 6a8bd0c509
commit 9968be55ed
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/activate/dev_manager.c
View File

@ -1679,6 +1679,9 @@ int dev_manager_thin_percent(struct dev_manager *dm,
return 1; return 1;
} }
/*
* Explore state of running DM table to obtain currently used deviceId
*/
int dev_manager_thin_device_id(struct dev_manager *dm, int dev_manager_thin_device_id(struct dev_manager *dm,
const struct logical_volume *lv, const struct logical_volume *lv,
uint32_t *device_id) uint32_t *device_id)
@ -1688,10 +1691,16 @@ int dev_manager_thin_device_id(struct dev_manager *dm,
struct dm_info info; struct dm_info info;
uint64_t start, length; uint64_t start, length;
char *params, *target_type = NULL; char *params, *target_type = NULL;
const char *layer = lv_layer(lv);
int r = 0; int r = 0;
if (lv_is_merging_origin(lv) && !lv_info(lv->vg->cmd, lv, 1, NULL, 0, 0))
/* If the merge has already happened, that table
* can already be using correct LV without -real layer */
layer = NULL;
/* Build dlid for the thin layer */ /* Build dlid for the thin layer */
if (!(dlid = build_dm_uuid(dm->mem, lv, lv_layer(lv)))) if (!(dlid = build_dm_uuid(dm->mem, lv, layer)))
return_0; return_0;
if (!(dmt = _setup_task_run(DM_DEVICE_TABLE, &info, NULL, dlid, 0, 0, 0, 0, 1, 0))) if (!(dmt = _setup_task_run(DM_DEVICE_TABLE, &info, NULL, dlid, 0, 0, 0, 0, 1, 0)))