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.

diff --git a/WHATS_NEW b/WHATS_NEW
index adca43e244ffce09b8009e77814c96fd47630f90..c61b19e087ed2b883e202be36b1ed6b3f97f5d46 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 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.
   Populate lvmcache from lvmetad before displaying PVs in pvscan. (2.02.94)
   Suppress incorrect -n pvscan warning now always displayed. (2.02.94)

diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index bbd2b9f84344524224dd3689beeab9949502e4a4..4dead75921b3b85514dc46d9b052786bdb4f86c2 100644 (file)
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
@@ -1591,7 +1591,10 @@ static int _dm_tree_deactivate_children(struct dm_tree_node *dnode,
                if (child->callback &&
                    !child->callback(child, DM_NODE_CALLBACK_DEACTIVATED,
                                     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) &&
                    !_dm_tree_deactivate_children(child, uuid_prefix, uuid_prefix_len, level + 1))