shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00
Code Releases Activity

lvremove: reuse existing dm_build_dm_uuid

Browse Source 
Use existing dm_build_dm_uuid() to generate LV's DM UUID.
This commit is contained in:
Zdenek Kabelac 2024-05-30 14:17:33 +02:00
parent a8b8e1f074
commit 91502446ac
1 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tools/toollib.c
View File

@ -4784,26 +4784,6 @@ out:
return ret_max; return ret_max;
} }
static void _lvremove_save_uuid(struct cmd_context *cmd, struct logical_volume *lv,
struct lvremove_params *lp)
{
char dm_uuid[DM_UUID_LEN] = { 0 };
/*
* Create the dm/uuid string that would be displayed
* in sysfs for this LV.
*
* DM_UUID_LEN is 129
* ID_LEN is 32
*/
memcpy(dm_uuid, "LVM-", 4);
memcpy(dm_uuid+4, &lv->vg->id, ID_LEN);
memcpy(dm_uuid+4+ID_LEN, &lv->lvid.id[1], ID_LEN);
if (!str_list_add(cmd->mem, &lp->removed_uuids, dm_pool_strdup(cmd->mem, dm_uuid)))
stack;
}
int lvremove_single(struct cmd_context *cmd, struct logical_volume *lv, int lvremove_single(struct cmd_context *cmd, struct logical_volume *lv,
struct processing_handle *handle) struct processing_handle *handle)
{ {
@ -4820,8 +4800,11 @@ int lvremove_single(struct cmd_context *cmd, struct logical_volume *lv,
if (!lv_remove_with_dependencies(cmd, lv, force, 0)) if (!lv_remove_with_dependencies(cmd, lv, force, 0))
return_ECMD_FAILED; return_ECMD_FAILED;
if (cmd->scan_lvs && cmd->enable_devices_file) if (cmd->scan_lvs && cmd->enable_devices_file && lp)
_lvremove_save_uuid(cmd, lv, lp); /* save for removal */
if (!str_list_add(cmd->mem, &lp->removed_uuids,
dm_build_dm_uuid(cmd->mem, UUID_PREFIX, lv->lvid.s, NULL)))
stack;
return ECMD_PROCESSED; return ECMD_PROCESSED;
} }