From 462de06d9640c237a23ad4ab2c0a5529387868d6 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Sun, 4 Mar 2012 17:36:23 +0000 Subject: [PATCH] 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. --- WHATS_NEW | 1 + libdm/libdm-deptree.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/WHATS_NEW b/WHATS_NEW index adca43e24..c61b19e08 100644 --- 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 bbd2b9f84..4dead7592 100644 --- 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))