mirror of
git://sourceware.org/git/lvm2.git
synced 2025-01-02 01:18:26 +03:00
Refactor format1 vg->pvs list add and vg->pv_count.
Refactor adding to the vg->pvs list and incrementing the count, which will allow further refactoring. Should be no functional change. Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
This commit is contained in:
parent
36e9d03d1b
commit
b4a9a2d313
lib/format1
@ -224,8 +224,7 @@ int export_extents(struct disk_list *dl, uint32_t lv_num,
|
||||
struct logical_volume *lv, struct physical_volume *pv);
|
||||
|
||||
int import_pvs(const struct format_type *fmt, struct dm_pool *mem,
|
||||
struct volume_group *vg,
|
||||
struct dm_list *pvds, struct dm_list *results, uint32_t *count);
|
||||
struct volume_group *vg, struct dm_list *pvds);
|
||||
|
||||
int import_lvs(struct dm_pool *mem, struct volume_group *vg, struct dm_list *pvds);
|
||||
int export_lvs(struct disk_list *dl, struct volume_group *vg,
|
||||
|
@ -142,7 +142,7 @@ static struct volume_group *_build_vg(struct format_instance *fid,
|
||||
if (!import_vg(mem, vg, dl))
|
||||
goto_bad;
|
||||
|
||||
if (!import_pvs(fid->fmt, mem, vg, pvs, &vg->pvs, &vg->pv_count))
|
||||
if (!import_pvs(fid->fmt, mem, vg, pvs))
|
||||
goto_bad;
|
||||
|
||||
if (!import_lvs(mem, vg, pvs))
|
||||
|
@ -422,13 +422,12 @@ int export_extents(struct disk_list *dl, uint32_t lv_num,
|
||||
}
|
||||
|
||||
int import_pvs(const struct format_type *fmt, struct dm_pool *mem,
|
||||
struct volume_group *vg,
|
||||
struct dm_list *pvds, struct dm_list *results, uint32_t *count)
|
||||
struct volume_group *vg, struct dm_list *pvds)
|
||||
{
|
||||
struct disk_list *dl;
|
||||
struct pv_list *pvl;
|
||||
|
||||
*count = 0;
|
||||
vg->pv_count = 0;
|
||||
dm_list_iterate_items(dl, pvds) {
|
||||
if (!(pvl = dm_pool_zalloc(mem, sizeof(*pvl))) ||
|
||||
!(pvl->pv = dm_pool_alloc(mem, sizeof(*pvl->pv))))
|
||||
@ -438,8 +437,8 @@ int import_pvs(const struct format_type *fmt, struct dm_pool *mem,
|
||||
return_0;
|
||||
|
||||
pvl->pv->fmt = fmt;
|
||||
dm_list_add(results, &pvl->list);
|
||||
(*count)++;
|
||||
dm_list_add(&vg->pvs, &pvl->list);
|
||||
vg->pv_count++;
|
||||
}
|
||||
|
||||
return 1;
|
||||
|
Loading…
Reference in New Issue
Block a user