diff options
| author | Alasdair Kergon <agk@redhat.com> | 2010-12-08 20:50:48 +0000 |
|---|---|---|
| committer | Alasdair Kergon <agk@redhat.com> | 2010-12-08 20:50:48 +0000 |
| commit | 2b82bd79f59ffb49cc864cf0d2e9268c652443d3 (patch) | |
| tree | 597817553c3ff5b4d6072e7ee37508b6deafe830 /tools/vgmerge.c | |
| parent | e8bed35ddf264c67c44b9cf9cedef6b078bfd710 (diff) | |
| download | lvm2-2b82bd79f59ffb49cc864cf0d2e9268c652443d3.tar.gz | |
Rename vg_release to free_vg.
Diffstat (limited to 'tools/vgmerge.c')
| -rw-r--r-- | tools/vgmerge.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/vgmerge.c b/tools/vgmerge.c index 403a5e040..4d55510e2 100644 --- a/tools/vgmerge.c +++ b/tools/vgmerge.c @@ -22,7 +22,7 @@ static struct volume_group *_vgmerge_vg_read(struct cmd_context *cmd, log_verbose("Checking for volume group \"%s\"", vg_name); vg = vg_read_for_update(cmd, vg_name, NULL, 0); if (vg_read_error(vg)) { - vg_release(vg); + free_vg(vg); return NULL; } return vg; @@ -54,7 +54,7 @@ static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to, vg_to = _vgmerge_vg_read(cmd, vg_name_to); if (!vg_to) { stack; - unlock_and_release_vg(cmd, vg_from, vg_name_from); + unlock_and_free_vg(cmd, vg_from, vg_name_from); return ECMD_FAILED; } } else { @@ -67,7 +67,7 @@ static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to, vg_from = _vgmerge_vg_read(cmd, vg_name_from); if (!vg_from) { stack; - unlock_and_release_vg(cmd, vg_to, vg_name_to); + unlock_and_free_vg(cmd, vg_to, vg_name_to); return ECMD_FAILED; } } @@ -148,11 +148,11 @@ static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to, r = ECMD_PROCESSED; bad: if (lock_vg_from_first) { - unlock_and_release_vg(cmd, vg_to, vg_name_to); - unlock_and_release_vg(cmd, vg_from, vg_name_from); + unlock_and_free_vg(cmd, vg_to, vg_name_to); + unlock_and_free_vg(cmd, vg_from, vg_name_from); } else { - unlock_and_release_vg(cmd, vg_from, vg_name_from); - unlock_and_release_vg(cmd, vg_to, vg_name_to); + unlock_and_free_vg(cmd, vg_from, vg_name_from); + unlock_and_free_vg(cmd, vg_to, vg_name_to); } return r; } |