summaryrefslogtreecommitdiffstats
path: root/tools/pvchange.c
diff options
context:
space:
mode:
authorAlasdair Kergon <agk@redhat.com>2002-02-27 12:26:41 +0000
committerAlasdair Kergon <agk@redhat.com>2002-02-27 12:26:41 +0000
commitf4cbeaf0acd734cecae649e9d01904aac8ce3748 (patch)
tree2f35f6fc9cffae40e6160108d321a9ee292bcb6b /tools/pvchange.c
parentb8583f6f9fbb20a4586eb2356708fc9774f9e34b (diff)
downloadlvm2-f4cbeaf0acd734cecae649e9d01904aac8ce3748.tar.gz
lvm2-f4cbeaf0acd734cecae649e9d01904aac8ce3748.tar.xz
lvm2-f4cbeaf0acd734cecae649e9d01904aac8ce3748.zip
o Lock mechanism for LV activation
o #defines for common lock flag combinations o Try out hyphens instead of colons in device-mapper names - does this make messages containing filenames easier to read?
Diffstat (limited to 'tools/pvchange.c')
-rw-r--r--tools/pvchange.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/pvchange.c b/tools/pvchange.c
index eb68fff5..7277c9a0 100644
--- a/tools/pvchange.c
+++ b/tools/pvchange.c
@@ -98,32 +98,32 @@ int pvchange_single(struct cmd_context *cmd, struct physical_volume *pv)
log_verbose("Finding volume group of physical volume \"%s\"",
pv_name);
- if (!lock_vol(cmd, pv->vg_name, LCK_VG | LCK_WRITE)) {
+ if (!lock_vol(cmd, pv->vg_name, LCK_VG_WRITE)) {
log_error("Can't get lock for %s", pv->vg_name);
return ECMD_FAILED;
}
if (!(vg = cmd->fid->ops->vg_read(cmd->fid, pv->vg_name))) {
- lock_vol(cmd, pv->vg_name, LCK_VG | LCK_NONE);
+ lock_vol(cmd, pv->vg_name, LCK_VG_UNLOCK);
log_error("Unable to find volume group of \"%s\"",
pv_name);
return 0;
}
if (vg->status & EXPORTED_VG) {
- lock_vol(cmd, pv->vg_name, LCK_VG | LCK_NONE);
+ lock_vol(cmd, pv->vg_name, LCK_VG_UNLOCK);
log_error("Volume group \"%s\" is exported", vg->name);
return ECMD_FAILED;
}
if (!(vg->status & LVM_WRITE)) {
- lock_vol(cmd, pv->vg_name, LCK_VG | LCK_NONE);
+ lock_vol(cmd, pv->vg_name, LCK_VG_UNLOCK);
log_error("Volume group \"%s\" is read-only", vg->name);
return ECMD_FAILED;
}
if (!(pvl = find_pv_in_vg(vg, pv_name))) {
- lock_vol(cmd, pv->vg_name, LCK_VG | LCK_NONE);
+ lock_vol(cmd, pv->vg_name, LCK_VG_UNLOCK);
log_error
("Unable to find \"%s\" in volume group \"%s\"",
pv_name, vg->name);
@@ -139,7 +139,7 @@ int pvchange_single(struct cmd_context *cmd, struct physical_volume *pv)
log_error("Physical volume \"%s\" is already allocatable",
pv_name);
if (*pv->vg_name)
- lock_vol(cmd, pv->vg_name, LCK_VG | LCK_NONE);
+ lock_vol(cmd, pv->vg_name, LCK_VG_UNLOCK);
return 0;
}
@@ -147,7 +147,7 @@ int pvchange_single(struct cmd_context *cmd, struct physical_volume *pv)
log_error("Physical volume \"%s\" is already unallocatable",
pv_name);
if (*pv->vg_name)
- lock_vol(cmd, pv->vg_name, LCK_VG | LCK_NONE);
+ lock_vol(cmd, pv->vg_name, LCK_VG_UNLOCK);
return 0;
}
@@ -164,13 +164,13 @@ int pvchange_single(struct cmd_context *cmd, struct physical_volume *pv)
log_verbose("Updating physical volume \"%s\"", pv_name);
if (*pv->vg_name) {
if (!(cmd->fid->ops->vg_write(cmd->fid, vg))) {
- lock_vol(cmd, pv->vg_name, LCK_VG | LCK_NONE);
+ lock_vol(cmd, pv->vg_name, LCK_VG_UNLOCK);
log_error("Failed to store physical volume \"%s\" in "
"volume group \"%s\"", pv_name, vg->name);
return 0;
}
backup(vg);
- lock_vol(cmd, pv->vg_name, LCK_VG | LCK_NONE);
+ lock_vol(cmd, pv->vg_name, LCK_VG_UNLOCK);
} else {
if (!(cmd->fid->ops->pv_write(cmd->fid, pv))) {
log_error("Failed to store physical volume \"%s\"",