diff options
| author | Alasdair Kergon <agk@redhat.com> | 2002-03-11 15:08:39 +0000 |
|---|---|---|
| committer | Alasdair Kergon <agk@redhat.com> | 2002-03-11 15:08:39 +0000 |
| commit | be326a2f1bea8dcea91497334168c81796f38d00 (patch) | |
| tree | df950bc46ff2c3af3683b985fd940f5fc4fe1998 /tools/vgmerge.c | |
| parent | 323a167b491a8a1cc0173b98c76757cd41c6c313 (diff) | |
| download | lvm2-be326a2f1bea8dcea91497334168c81796f38d00.tar.gz lvm2-be326a2f1bea8dcea91497334168c81796f38d00.tar.xz lvm2-be326a2f1bea8dcea91497334168c81796f38d00.zip | |
o activate/reactivate merge
o unlocking macro
Diffstat (limited to 'tools/vgmerge.c')
| -rw-r--r-- | tools/vgmerge.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/vgmerge.c b/tools/vgmerge.c index 26a52312..72c4b7e1 100644 --- a/tools/vgmerge.c +++ b/tools/vgmerge.c @@ -67,26 +67,26 @@ int vgmerge_single(struct cmd_context *cmd, const char *vg_name_to, if (!(vg_to = cmd->fid->ops->vg_read(cmd->fid, vg_name_to))) { log_error("Volume group \"%s\" doesn't exist", vg_name_to); - lock_vol(cmd, vg_name_to, LCK_VG_UNLOCK); + unlock_vg(cmd, vg_name_to); return ECMD_FAILED; } if (vg_to->status & EXPORTED_VG) { log_error("Volume group \"%s\" is exported", vg_to->name); - lock_vol(cmd, vg_name_to, LCK_VG_UNLOCK); + unlock_vg(cmd, vg_name_to); return ECMD_FAILED; } if (!(vg_to->status & LVM_WRITE)) { log_error("Volume group \"%s\" is read-only", vg_to->name); - lock_vol(cmd, vg_name_to, LCK_VG_UNLOCK); + unlock_vg(cmd, vg_name_to); return ECMD_FAILED; } log_verbose("Checking for volume group \"%s\"", vg_name_from); if (!lock_vol(cmd, vg_name_from, LCK_VG_WRITE | LCK_NONBLOCK)) { log_error("Can't get lock for %s", vg_name_from); - lock_vol(cmd, vg_name_to, LCK_VG_UNLOCK); + unlock_vg(cmd, vg_name_to); return ECMD_FAILED; } @@ -190,15 +190,15 @@ int vgmerge_single(struct cmd_context *cmd, const char *vg_name_to, backup(vg_to); - lock_vol(cmd, vg_name_from, LCK_VG_UNLOCK); - lock_vol(cmd, vg_name_to, LCK_VG_UNLOCK); + unlock_vg(cmd, vg_name_from); + unlock_vg(cmd, vg_name_to); log_print("Volume group \"%s\" successfully merged into \"%s\"", vg_from->name, vg_to->name); return 0; error: - lock_vol(cmd, vg_name_from, LCK_VG_UNLOCK); - lock_vol(cmd, vg_name_to, LCK_VG_UNLOCK); + unlock_vg(cmd, vg_name_from); + unlock_vg(cmd, vg_name_to); return ECMD_FAILED; } |