From aaa6205d5ad4beb8a54d56f9285cafb5dbd5c7b4 Mon Sep 17 00:00:00 2001 From: David Teigland Date: Tue, 18 Nov 2014 09:22:37 -0600 Subject: [PATCH] toollib: improve ignore_vg case in _process_pvs_in_vgs ignore_vg now returns 0 for the FAILED_CLUSTERED case, so all the ignore_vg 1 cases will return vg's with an empty vg->pvs, so we do not need to iterate through vg->pvs to remove the entries from the devices list. Clean up whitespace problems in that area from the previous commit. --- tools/toollib.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/tools/toollib.c b/tools/toollib.c index 8eb434d97..30dc980ba 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -2200,25 +2200,26 @@ static int _process_pvs_in_vgs(struct cmd_context *cmd, uint32_t flags, vg = vg_read(cmd, vg_name, vg_uuid, flags | READ_WARN_INCONSISTENT); if (ignore_vg(vg, vg_name, flags & READ_ALLOW_INCONSISTENT, &skip)) { stack; - ret = ECMD_FAILED; - skip = 1; - - /* Only continue if no vg was returned. */ - if (!vg) - continue; + ret_max = ECMD_FAILED; + continue; } + /* + * Don't continue when skip is set, because we need to remove + * vg->pvs entries from devices list. + */ + ret = _process_pvs_in_vg(cmd, vg, all_devices, arg_pvnames, arg_tags, process_all, skip, handle, process_single_pv); if (ret != ECMD_PROCESSED) stack; - if (ret > ret_max) + if (ret > ret_max) ret_max = ret; - if (skip) - release_vg(vg); - else - unlock_and_release_vg(cmd, vg, vg->name); + if (skip) + release_vg(vg); + else + unlock_and_release_vg(cmd, vg, vg->name); /* Quit early when possible. */ if (!process_all && dm_list_empty(arg_tags) && dm_list_empty(arg_pvnames))