diff options
| author | Alasdair Kergon <agk@redhat.com> | 2002-02-25 12:56:16 +0000 |
|---|---|---|
| committer | Alasdair Kergon <agk@redhat.com> | 2002-02-25 12:56:16 +0000 |
| commit | 413cc9189e5a77a10ce227072855141cd7af79d7 (patch) | |
| tree | 57a1288121d4c70292b06c23b05f3c6c1d346178 /tools/vgmerge.c | |
| parent | ca73e23fd08850c916b9bf5671adfc68384ae466 (diff) | |
| download | lvm2-413cc9189e5a77a10ce227072855141cd7af79d7.tar.gz lvm2-413cc9189e5a77a10ce227072855141cd7af79d7.tar.xz lvm2-413cc9189e5a77a10ce227072855141cd7af79d7.zip | |
Begin conversion so LV id is passed to activation unit instead of
struct logical_volume.
Diffstat (limited to 'tools/vgmerge.c')
| -rw-r--r-- | tools/vgmerge.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tools/vgmerge.c b/tools/vgmerge.c index 8c487728..29a6dad5 100644 --- a/tools/vgmerge.c +++ b/tools/vgmerge.c @@ -60,33 +60,33 @@ int vgmerge_single(struct cmd_context *cmd, const char *vg_name_to, } log_verbose("Checking for volume group \"%s\"", vg_name_to); - if (!lock_vol(vg_name_to, LCK_VG | LCK_WRITE)) { + if (!lock_vol(cmd, vg_name_to, LCK_VG | LCK_WRITE)) { log_error("Can't get lock for %s", vg_name_to); return ECMD_FAILED; } 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(vg_name_to, LCK_VG | LCK_NONE); + lock_vol(cmd, vg_name_to, LCK_VG | LCK_NONE); return ECMD_FAILED; } if (vg_to->status & EXPORTED_VG) { log_error("Volume group \"%s\" is exported", vg_to->name); - lock_vol(vg_name_to, LCK_VG | LCK_NONE); + lock_vol(cmd, vg_name_to, LCK_VG | LCK_NONE); return ECMD_FAILED; } if (!(vg_to->status & LVM_WRITE)) { log_error("Volume group \"%s\" is read-only", vg_to->name); - lock_vol(vg_name_to, LCK_VG | LCK_NONE); + lock_vol(cmd, vg_name_to, LCK_VG | LCK_NONE); return ECMD_FAILED; } log_verbose("Checking for volume group \"%s\"", vg_name_from); - if (!lock_vol(vg_name_from, LCK_VG | LCK_WRITE | LCK_NONBLOCK)) { + if (!lock_vol(cmd, vg_name_from, LCK_VG | LCK_WRITE | LCK_NONBLOCK)) { log_error("Can't get lock for %s", vg_name_from); - lock_vol(vg_name_to, LCK_VG | LCK_NONE); + lock_vol(cmd, vg_name_to, LCK_VG | LCK_NONE); return ECMD_FAILED; } @@ -190,15 +190,15 @@ int vgmerge_single(struct cmd_context *cmd, const char *vg_name_to, backup(vg_to); - lock_vol(vg_name_from, LCK_VG | LCK_NONE); - lock_vol(vg_name_to, LCK_VG | LCK_NONE); + lock_vol(cmd, vg_name_from, LCK_VG | LCK_NONE); + lock_vol(cmd, vg_name_to, LCK_VG | LCK_NONE); log_print("Volume group \"%s\" successfully merged into \"%s\"", vg_from->name, vg_to->name); return 0; error: - lock_vol(vg_name_from, LCK_VG | LCK_NONE); - lock_vol(vg_name_to, LCK_VG | LCK_NONE); + lock_vol(cmd, vg_name_from, LCK_VG | LCK_NONE); + lock_vol(cmd, vg_name_to, LCK_VG | LCK_NONE); return ECMD_FAILED; } |