From fcae18ceb9a6db7182abbbea379d45cebb901313 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 13 Mar 2019 14:14:43 +0800 Subject: [PATCH 07/17] dmsetup: fix stats report command output Since the stats handle is neither bound nor listed before the attempt to call dm_stats_get_nr_regions(), it will always return zero: this prevents reporting of any dmstats regions on any device. Remove the dm_stats_get_nr_regions() check and instead rely on the correct return status from dm_stats_populate() which only returns 0 in the case that there are regions to inspect (and which logs a specific error for all other cases). Reported-by: Bryan Gurney --- tools/dmsetup.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tools/dmsetup.c b/tools/dmsetup.c index af70a02..aca595d 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -910,17 +910,13 @@ static int _display_info_cols(struct dm_task *dmt, struct dm_info *info) if (!(obj.stats = dm_stats_create(DM_STATS_PROGRAM_ID))) goto_out; - if (!dm_stats_get_nr_regions(obj.stats)) { - log_debug("Skipping %s with no regions.", dm_task_get_name(dmt)); + dm_stats_bind_devno(obj.stats, info->major, info->minor); + + if (!dm_stats_populate(obj.stats, _program_id, DM_STATS_REGIONS_ALL)) { r = 1; goto out; } - dm_stats_bind_devno(obj.stats, info->major, info->minor); - - if (!dm_stats_populate(obj.stats, _program_id, DM_STATS_REGIONS_ALL)) - goto_out; - /* Update timestamps and handle end-of-interval accounting. */ _update_interval_times(); -- 2.19.1