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

Return success for deactivation of thin pool

if the thin_check fail on thin pool - still return successful deactivation,
since lvremove would currently fail.

TODO: find some way to not run check with lvremove.
This commit is contained in:
Zdenek Kabelac 2012-03-04 17:36:23 +00:00
parent b3103ef328
commit 462de06d96
2 changed files with 5 additions and 1 deletions

View File

@ -1,5 +1,6 @@
Version 2.02.95 - Version 2.02.95 -
================================ ================================
Deactivation of failed thin check on thin pool returns success.
Scan all devices for lvmetad if 'pvscan --cache' used without device list. Scan all devices for lvmetad if 'pvscan --cache' used without device list.
Populate lvmcache from lvmetad before displaying PVs in pvscan. (2.02.94) Populate lvmcache from lvmetad before displaying PVs in pvscan. (2.02.94)
Suppress incorrect -n pvscan warning now always displayed. (2.02.94) Suppress incorrect -n pvscan warning now always displayed. (2.02.94)

View File

@ -1591,7 +1591,10 @@ static int _dm_tree_deactivate_children(struct dm_tree_node *dnode,
if (child->callback && if (child->callback &&
!child->callback(child, DM_NODE_CALLBACK_DEACTIVATED, !child->callback(child, DM_NODE_CALLBACK_DEACTIVATED,
child->callback_data)) child->callback_data))
r = 0; // FIXME: _node_clear_table() without callback ? stack;
// FIXME: We need to let lvremove pass,
// so for now deactivation ignores check result
//r = 0; // FIXME: _node_clear_table() without callback ?
if (dm_tree_node_num_children(child, 0) && if (dm_tree_node_num_children(child, 0) &&
!_dm_tree_deactivate_children(child, uuid_prefix, uuid_prefix_len, level + 1)) !_dm_tree_deactivate_children(child, uuid_prefix, uuid_prefix_len, level + 1))