shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-11 20:58:50 +03:00
Code Releases Activity

Move orphan lock inside vg_remove_single.

Browse Source 
Move the vg orphan lock inside vg_remove_single, now a complete liblvm
function.  Note that this changes the order of the locks - originally
VG_ORPHAN was obtained first, then the vgname lock.  With the current
policy of non-blocking second locks, this could mean we get a failure
obtaining the orphan lock.  In the case of a vg with lvs being removed,
this could result in the lvs being removed but not the vg.  Such a
scenario could have happened prior though with a different failure.
Other tools were examined for side-effects, and no major problems
were noted.

Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
This commit is contained in:
Dave Wysochanski 2009-07-10 20:08:37 +00:00
parent 42ae96fa3d
commit 03660b3045
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/metadata/metadata.c
View File

@ -388,8 +388,14 @@ int vg_remove_single(vg_t *vg)
if (!archive(vg)) if (!archive(vg))
return 0; return 0;
if (!lock_vol(vg->cmd, VG_ORPHANS, LCK_VG_WRITE)) {
log_error("Can't get lock for orphan PVs");
return 0;
}
if (!vg_remove(vg)) { if (!vg_remove(vg)) {
log_error("vg_remove %s failed", vg->name); log_error("vg_remove %s failed", vg->name);
unlock_vg(vg->cmd, VG_ORPHANS);
return 0; return 0;
} }
@ -423,6 +429,7 @@ int vg_remove_single(vg_t *vg)
else else
log_error("Volume group \"%s\" not properly removed", vg->name); log_error("Volume group \"%s\" not properly removed", vg->name);
unlock_vg(vg->cmd, VG_ORPHANS);
return ret; return ret;
} }

7
tools/vgremove.c
View File

@ -56,16 +56,9 @@ int vgremove(struct cmd_context *cmd, int argc, char **argv)
return EINVALID_CMD_LINE; return EINVALID_CMD_LINE;
} }
if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE)) {
log_error("Can't get lock for orphan PVs");
return ECMD_FAILED;
}
ret = process_each_vg(cmd, argc, argv, ret = process_each_vg(cmd, argc, argv,
READ_FOR_UPDATE, READ_FOR_UPDATE,
NULL, &vgremove_single); NULL, &vgremove_single);
unlock_vg(cmd, VG_ORPHANS);
return ret; return ret;
} }