From 3405ead1e09aa6916cd5ac84ae629c13991e6ec5 Mon Sep 17 00:00:00 2001 From: David Teigland Date: Fri, 3 May 2019 16:12:43 -0500 Subject: [PATCH] pvs: remove unnecessary label scan The scanning rework missed removing this instance of label scan. It's no longer needed because of the way that label scan is always run once from the start of the command. This unnecessary scan would be triggered by running 'pvs @tag'. --- tools/reporter.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/tools/reporter.c b/tools/reporter.c index 48050ec07..db982b393 100644 --- a/tools/reporter.c +++ b/tools/reporter.c @@ -708,7 +708,6 @@ int report_for_selection(struct cmd_context *cmd, static void _check_pv_list(struct cmd_context *cmd, struct report_args *args, struct single_report_args *single_args) { int i; - int rescan_done = 0; if (!args->argv) return; @@ -719,12 +718,6 @@ static void _check_pv_list(struct cmd_context *cmd, struct report_args *args, st if (single_args->args_are_pvs && args->argc) { for (i = 0; i < args->argc; i++) { - if (!rescan_done && !dev_cache_get(cmd, args->argv[i], cmd->filter)) { - cmd->filter->wipe(cmd->filter); - /* FIXME scan only one device */ - lvmcache_label_scan(cmd); - rescan_done = 1; - } if (*args->argv[i] == '@') { /* * Tags are metadata related, not label @@ -732,13 +725,7 @@ static void _check_pv_list(struct cmd_context *cmd, struct report_args *args, st */ if (single_args->report_type == LABEL) single_args->report_type = PVS; - /* - * If we changed the report_type and we did rescan, - * no need to iterate over dev list further - nothing - * else would change. - */ - if (rescan_done) - break; + break; } } }