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

lvconvert: Rename _swap_lv to _swap_lv_identifiers and move to allow an additional user

Browse Source
This commit is contained in:
Mike Snitzer 2013-07-02 17:02:25 -04:00
parent f9e0adcce5
commit fe09d84668
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.99 - Version 2.02.99 -
=================================== ===================================
Rename _swap_lv to _swap_lv_identifiers and move to allow an additional user.
Rename snapshot segment returning methods from find_*_cow to find_*_snapshot. Rename snapshot segment returning methods from find_*_cow to find_*_snapshot.
liblvm/python API: Additions: PV create/removal/resize/listing liblvm/python API: Additions: PV create/removal/resize/listing
liblvm/python API: Additions: LV attr/origin/Thin pool/Thin LV creation liblvm/python API: Additions: LV attr/origin/Thin pool/Thin LV creation

42
tools/lvconvert.c
View File

@ -650,6 +650,25 @@ static progress_t _poll_merge_progress(struct cmd_context *cmd,
return PROGRESS_UNFINISHED; return PROGRESS_UNFINISHED;
} }
/* Swap lvid and LV names */
static int _swap_lv_identifiers(struct cmd_context *cmd,
struct logical_volume *a, struct logical_volume *b)
{
union lvid lvid;
const char *name;
lvid = a->lvid;
a->lvid = b->lvid;
b->lvid = lvid;
name = a->name;
a->name = b->name;
if (!lv_rename_update(cmd, b, name, 0))
return_0;
return 1;
}
static struct poll_functions _lvconvert_mirror_fns = { static struct poll_functions _lvconvert_mirror_fns = {
.get_copy_vg = _get_lvconvert_vg, .get_copy_vg = _get_lvconvert_vg,
.get_copy_lv = _get_lvconvert_lv, .get_copy_lv = _get_lvconvert_lv,
@ -1869,25 +1888,6 @@ out:
return r; return r;
} }
/* Swap lvid and LV names */
static int _swap_lv(struct cmd_context *cmd,
struct logical_volume *a, struct logical_volume *b)
{
union lvid lvid;
const char *name;
lvid = a->lvid;
a->lvid = b->lvid;
b->lvid = lvid;
name = a->name;
a->name = b->name;
if (!lv_rename_update(cmd, b, name, 0))
return_0;
return 1;
}
static int _lvconvert_thinpool_external(struct cmd_context *cmd, static int _lvconvert_thinpool_external(struct cmd_context *cmd,
struct logical_volume *pool_lv, struct logical_volume *pool_lv,
struct logical_volume *external_lv, struct logical_volume *external_lv,
@ -1932,7 +1932,7 @@ static int _lvconvert_thinpool_external(struct cmd_context *cmd,
* which could be easily removed by the user after i.e. power-off * which could be easily removed by the user after i.e. power-off
*/ */
if (!_swap_lv(cmd, torigin_lv, external_lv)) { if (!_swap_lv_identifiers(cmd, torigin_lv, external_lv)) {
stack; stack;
goto revert_new_lv; goto revert_new_lv;
} }
@ -1956,7 +1956,7 @@ static int _lvconvert_thinpool_external(struct cmd_context *cmd,
return 1; return 1;
deactivate_and_revert_new_lv: deactivate_and_revert_new_lv:
if (!_swap_lv(cmd, torigin_lv, external_lv)) if (!_swap_lv_identifiers(cmd, torigin_lv, external_lv))
stack; stack;
if (!deactivate_lv(cmd, torigin_lv)) { if (!deactivate_lv(cmd, torigin_lv)) {