46 lines
1.2 KiB
Diff
46 lines
1.2 KiB
Diff
|
From 4493c6a45c334751ab99428ca0f072f7486e3b2c Mon Sep 17 00:00:00 2001
|
||
|
|
From: root <root@localhost.localdomain>
|
||
|
|
Date: Wed, 13 Mar 2019 14:13:16 +0800
|
||
|
|
Subject: [PATCH 06/17] libdm-stats: move no regions warning after
|
||
|
|
dm_stats_list()
|
||
|
|
|
||
|
|
It doesn't make sense to test or warn about the region count until
|
||
|
|
the stats handle has been listed: at this point it may or may not
|
||
|
|
contain valid information (but is guaranteed to be correct after
|
||
|
|
the list).
|
||
|
|
---
|
||
|
|
libdm/libdm-stats.c | 10 +++++-----
|
||
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/libdm/libdm-stats.c b/libdm/libdm-stats.c
|
||
|
|
index 94ad380..6b4e3d8 100644
|
||
|
|
--- a/libdm/libdm-stats.c
|
||
|
|
+++ b/libdm/libdm-stats.c
|
||
|
|
@@ -2336,11 +2336,6 @@ int dm_stats_populate(struct dm_stats *dms, const char *program_id,
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (!dms->nr_regions) {
|
||
|
|
- log_error("No regions registered.");
|
||
|
|
- return 0;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
/* allow zero-length program_id for populate */
|
||
|
|
if (!program_id)
|
||
|
|
program_id = dms->program_id;
|
||
|
|
@@ -2352,6 +2347,11 @@ int dm_stats_populate(struct dm_stats *dms, const char *program_id,
|
||
|
|
goto_bad;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ if (!dms->nr_regions) {
|
||
|
|
+ log_verbose("No stats regions registered: %s", dms->name);
|
||
|
|
+ return 0;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
dms->walk_flags = DM_STATS_WALK_REGION;
|
||
|
|
dm_stats_walk_start(dms);
|
||
|
|
do {
|
||
|
|
--
|
||
|
|
2.19.1
|
||
|
|
|