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

Revert assuming precommitted metadata is live when activating (unnecessary).

This commit is contained in:
Alasdair Kergon 2008-06-08 11:33:15 +00:00
parent 034ceb60ab
commit 424dd43e6f
2 changed files with 3 additions and 10 deletions

View File

@ -1,5 +1,6 @@
Version 2.02.38 -
=================================
Revert assuming precommitted metadata is live when activating (unnecessary).
Drop cached metadata for disappearing VG in vgmerge.
In script-processing mode, stop if any command fails.
Warn if command exits with non-zero status code without a prior log_error.

View File

@ -993,11 +993,7 @@ int lv_activation_filter(struct cmd_context *cmd, const char *lvid_s,
if (!activation())
goto activate;
/*
* If we're activating and precommitted metadata is still cached,
* we assume it matches the new live metadata.
*/
if (!(lv = lv_from_lvid(cmd, lvid_s, 1)))
if (!(lv = lv_from_lvid(cmd, lvid_s, 0)))
return 0;
if (!_passes_activation_filter(cmd, lv)) {
@ -1022,11 +1018,7 @@ static int _lv_activate(struct cmd_context *cmd, const char *lvid_s,
if (!activation())
return 1;
/*
* If we're activating and precommitted metadata is still cached,
* we assume it matches the new live metadata.
*/
if (!(lv = lv_from_lvid(cmd, lvid_s, 1)))
if (!(lv = lv_from_lvid(cmd, lvid_s, 0)))
return 0;
if (filter && !_passes_activation_filter(cmd, lv)) {