From a6a494150427c23e09b594be5c7268325a99122a Mon Sep 17 00:00:00 2001 From: Dave Wysochanski Date: Tue, 13 Apr 2010 17:25:26 +0000 Subject: [PATCH] Move increment of vg->pv_count from import_pool_vg() to import_pool_pvs(). Move the increment of vg->pv_count next to the place where we add to vg->pvs. It looks safe to do this since the only caller of import_pool_vg() calls import_pool_pvs() immediately afterward, and there is no way import_pool_vg() can fail (always returns 1). However, if there's a memory allocation failure inside import_pool_pvs(), we will end up with a different count in vg->pv_count that with the original code. In any case, vg->pv_count should be as close to dm_list_size(&vg->pvs) as possible, as is the case everywhere else in the code. Signed-off-by: Dave Wysochanski --- lib/format_pool/import_export.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/format_pool/import_export.c b/lib/format_pool/import_export.c index 26f617b4a..ee51f1f13 100644 --- a/lib/format_pool/import_export.c +++ b/lib/format_pool/import_export.c @@ -37,7 +37,6 @@ int import_pool_vg(struct volume_group *vg, struct dm_pool *mem, struct dm_list ((pl->pd.pl_blocks) / POOL_PE_SIZE); vg->free_count = vg->extent_count; - vg->pv_count++; if (vg->name) continue; @@ -120,6 +119,7 @@ int import_pool_pvs(const struct format_type *fmt, struct volume_group *vg, pl->pv = pvl->pv; pvl->mdas = NULL; pvl->pe_ranges = NULL; + vg->pv_count++; dm_list_add(&vg->pvs, &pvl->list); } -- 2.43.5