shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

dev_manager: improve readability

Browse Source 
Make a seperate function to decode which ID should be user
for cvol meta or data volume - also avoids duplication of code.
As a result it's now also easier to see how the lvid is build.
This commit is contained in:
Zdenek Kabelac 2024-04-04 01:29:30 +02:00
parent 41f13b2a3b
commit 50b188eebd
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/activate/dev_manager.c
View File

@ -2676,24 +2676,29 @@ static int _pool_register_callback(struct dev_manager *dm,
return 1; return 1;
} }
static struct id _get_id_for_meta_or_data(const struct lv_segment *lvseg, int meta_or_data)
{
/* When ID is provided in form of metadata_id or data_id, otherwise use CVOL ID */
if (meta_or_data && lvseg->metadata_id)
return *lvseg->metadata_id;
if (!meta_or_data && lvseg->data_id)
return *lvseg->data_id;
return lvseg->pool_lv->lvid.id[1];
}
/* Add special devices _cmeta & _cdata on top of CacheVol to dm tree */ /* Add special devices _cmeta & _cdata on top of CacheVol to dm tree */
static int _add_cvol_subdev_to_dtree(struct dev_manager *dm, struct dm_tree *dtree, static int _add_cvol_subdev_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
const struct logical_volume *lv, int meta_or_data) const struct logical_volume *lv, int meta_or_data)
{ {
const char *layer = meta_or_data ? "cmeta" : "cdata"; const char *layer = meta_or_data ? "cmeta" : "cdata";
struct dm_pool *mem = dm->track_pending_delete ? dm->cmd->pending_delete_mem : dm->mem; struct dm_pool *mem = dm->track_pending_delete ? dm->cmd->pending_delete_mem : dm->mem;
const struct logical_volume *pool_lv = first_seg(lv)->pool_lv;
struct lv_segment *lvseg = first_seg(lv); struct lv_segment *lvseg = first_seg(lv);
const struct logical_volume *pool_lv = lvseg->pool_lv;
struct dm_info info; struct dm_info info;
char *name ,*dlid; char *name ,*dlid;
union lvid lvid = { union lvid lvid = { { lv->vg->id, _get_id_for_meta_or_data(lvseg, meta_or_data) } };
{
lv->vg->id,
/* When ID is provided in form of metadata_id or data_id, otherwise use CVOL ID */
(meta_or_data && lvseg->metadata_id) ? *lvseg->metadata_id :
(lvseg->data_id) ? *lvseg->data_id : pool_lv->lvid.id[1]
}
};
if (!(dlid = dm_build_dm_uuid(mem, UUID_PREFIX, (const char *)&lvid.s, layer))) if (!(dlid = dm_build_dm_uuid(mem, UUID_PREFIX, (const char *)&lvid.s, layer)))
return_0; return_0;
@ -3346,14 +3351,7 @@ static int _add_new_cvol_subdev_to_dtree(struct dev_manager *dm,
const struct logical_volume *pool_lv = lvseg->pool_lv; const struct logical_volume *pool_lv = lvseg->pool_lv;
struct dm_tree_node *dnode; struct dm_tree_node *dnode;
char *dlid, *dlid_pool, *name; char *dlid, *dlid_pool, *name;
union lvid lvid = { union lvid lvid = { { lv->vg->id, _get_id_for_meta_or_data(lvseg, meta_or_data) } };
{
lv->vg->id,
/* When ID is provided in form of metadata_id or data_id, otherwise use CVOL ID */
(meta_or_data && lvseg->metadata_id) ? *lvseg->metadata_id :
(lvseg->data_id) ? *lvseg->data_id : pool_lv->lvid.id[1]
}
};
if (!(dlid = dm_build_dm_uuid(dm->mem, UUID_PREFIX, (const char *)&lvid.s, layer))) if (!(dlid = dm_build_dm_uuid(dm->mem, UUID_PREFIX, (const char *)&lvid.s, layer)))
return_0; return_0;