Remove unnecessary parameter from import_pool_pvs().

The dm_list * parameter is unnecessary since we are passing in 'vg'
and the only caller of import_pool_pvs() passes '&vg->pvs' in the
dm_list * parameter.  Just use vg->pvs directly in the function.

Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>

diff --git a/lib/format_pool/disk_rep.h b/lib/format_pool/disk_rep.h
index fb33cd889cc52f5f80d34eb6faca3350f503cf5f..fff734367b02aa989fcc83d025402811e254980c 100644 (file)
--- a/lib/format_pool/disk_rep.h
+++ b/lib/format_pool/disk_rep.h
@@ -141,7 +141,7 @@ int import_pool_vg(struct volume_group *vg, struct dm_pool *mem, struct dm_list
 int import_pool_lvs(struct volume_group *vg, struct dm_pool *mem,
                    struct dm_list *pls);
 int import_pool_pvs(const struct format_type *fmt, struct volume_group *vg,
-                   struct dm_list *pvs, struct dm_pool *mem, struct dm_list *pls);
+                   struct dm_pool *mem, struct dm_list *pls);
 int import_pool_pv(const struct format_type *fmt, struct dm_pool *mem,
                   struct volume_group *vg, struct physical_volume *pv,
                   struct pool_list *pl);

diff --git a/lib/format_pool/format_pool.c b/lib/format_pool/format_pool.c
index 26321c131bffd478d8898f87678971b7daf87bae..d8a09ec45014519978f1f77961f9561dc328632d 100644 (file)
--- a/lib/format_pool/format_pool.c
+++ b/lib/format_pool/format_pool.c
@@ -129,7 +129,7 @@ static struct volume_group *_build_vg_from_pds(struct format_instance
        if (!import_pool_vg(vg, smem, pds))
                return_NULL;
 
-       if (!import_pool_pvs(fid->fmt, vg, &vg->pvs, smem, pds))
+       if (!import_pool_pvs(fid->fmt, vg, smem, pds))
                return_NULL;
 
        if (!import_pool_lvs(vg, smem, pds))

diff --git a/lib/format_pool/import_export.c b/lib/format_pool/import_export.c
index e06b8f30767677bb1a842f2e844f9421087ce57b..26f617b4a92866abe0cb31d0386ea4e85a00012a 100644 (file)
--- a/lib/format_pool/import_export.c
+++ b/lib/format_pool/import_export.c
@@ -100,7 +100,7 @@ int import_pool_lvs(struct volume_group *vg, struct dm_pool *mem, struct dm_list
 }
 
 int import_pool_pvs(const struct format_type *fmt, struct volume_group *vg,
-                   struct dm_list *pvs, struct dm_pool *mem, struct dm_list *pls)
+                   struct dm_pool *mem, struct dm_list *pls)
 {
        struct pv_list *pvl;
        struct pool_list *pl;
@@ -120,7 +120,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;
-               dm_list_add(pvs, &pvl->list);
+               dm_list_add(&vg->pvs, &pvl->list);
        }
 
        return 1;