shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

format1: Fix snapshot reload in lv_remove.

Browse Source 
The special suspend/resume code in lv_remove for LVM1 snapshots was interpsersed
with a vg_commit call. However, while with LVM1 metadata, vg_commit is
technically a no-op, the activation code relied on the ondisk and incore
metadata being the same, since on LVM1, a "commit" happens in vg_write
already. Since the "ondisk" metadata was previously not available with format1
(and incore was silently used instead, via lvmcache), the problem was masked.
This commit is contained in:
Petr Rockai 2013-06-10 17:31:13 +02:00
parent 7d644443e0
commit f5a3bef276
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/metadata/lv_manip.c
View File

@ -3557,20 +3557,18 @@ int lv_remove_single(struct cmd_context *cmd, struct logical_volume *lv,
} }
/* store it on disks */ /* store it on disks */
if (!vg_write(vg)) if (!vg_write(vg) || !vg_commit(vg))
return_0; return_0;
/* format1 */ /* format1 */
if (format1_reload_required && !suspend_lv(cmd, format1_origin)) if (format1_reload_required) {
log_error("Failed to refresh %s without snapshot.", format1_origin->name); if (!suspend_lv(cmd, format1_origin))
log_error("Failed to refresh %s without snapshot.", format1_origin->name);
if (!vg_commit(vg)) if (!resume_lv(cmd, format1_origin)) {
return_0; log_error("Failed to resume %s.", format1_origin->name);
return 0;
/* format1 */ }
if (format1_reload_required && !resume_lv(cmd, format1_origin)) {
log_error("Failed to resume %s.", format1_origin->name);
return 0;
} }
/* Release unneeded blocks in thin pool */ /* Release unneeded blocks in thin pool */