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/vgsplit.c | |
| parent | e8bed35ddf264c67c44b9cf9cedef6b078bfd710 (diff) | |
| download | lvm2-2b82bd79f59ffb49cc864cf0d2e9268c652443d3.tar.gz lvm2-2b82bd79f59ffb49cc864cf0d2e9268c652443d3.tar.xz lvm2-2b82bd79f59ffb49cc864cf0d2e9268c652443d3.zip | |
Rename vg_release to free_vg.
Diffstat (limited to 'tools/vgsplit.c')
| -rw-r--r-- | tools/vgsplit.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tools/vgsplit.c b/tools/vgsplit.c index e6a65111..045c699f 100644 --- a/tools/vgsplit.c +++ b/tools/vgsplit.c @@ -223,16 +223,16 @@ static struct volume_group *_vgsplit_to(struct cmd_context *cmd, vg_to = vg_create(cmd, vg_name_to); if (vg_read_error(vg_to) == FAILED_LOCKING) { log_error("Can't get lock for %s", vg_name_to); - vg_release(vg_to); + free_vg(vg_to); return NULL; } if (vg_read_error(vg_to) == FAILED_EXIST) { *existing_vg = 1; - vg_release(vg_to); + free_vg(vg_to); vg_to = vg_read_for_update(cmd, vg_name_to, NULL, 0); if (vg_read_error(vg_to)) { - vg_release(vg_to); + free_vg(vg_to); stack; return NULL; } @@ -258,7 +258,7 @@ static struct volume_group *_vgsplit_from(struct cmd_context *cmd, vg_from = vg_read_for_update(cmd, vg_name_from, NULL, 0); if (vg_read_error(vg_from)) { - vg_release(vg_from); + free_vg(vg_from); return NULL; } return vg_from; @@ -333,7 +333,7 @@ int vgsplit(struct cmd_context *cmd, int argc, char **argv) vg_to = _vgsplit_to(cmd, vg_name_to, &existing_vg); if (!vg_to) { - unlock_and_release_vg(cmd, vg_from, vg_name_from); + unlock_and_free_vg(cmd, vg_from, vg_name_from); stack; return ECMD_FAILED; } @@ -345,7 +345,7 @@ int vgsplit(struct cmd_context *cmd, int argc, char **argv) } vg_from = _vgsplit_from(cmd, vg_name_from); if (!vg_from) { - unlock_and_release_vg(cmd, vg_to, vg_name_to); + unlock_and_free_vg(cmd, vg_to, vg_name_to); stack; return ECMD_FAILED; } @@ -462,7 +462,7 @@ int vgsplit(struct cmd_context *cmd, int argc, char **argv) * Finally, remove the EXPORTED flag from the new VG and write it out. */ if (!test_mode()) { - vg_release(vg_to); + free_vg(vg_to); vg_to = vg_read_for_update(cmd, vg_name_to, NULL, READ_ALLOW_EXPORTED); if (vg_read_error(vg_to)) { @@ -487,11 +487,11 @@ int vgsplit(struct cmd_context *cmd, int argc, char **argv) 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; } |