diff options
author | David Teigland <teigland@redhat.com> | 2016-01-26 11:58:25 -0600 |
---|---|---|
committer | David Teigland <teigland@redhat.com> | 2016-01-28 13:47:49 -0600 |
commit | 0b4f874469aaee20f4a16d0c4261a6226fdfac90 (patch) | |
tree | d5f7ce624371f6e54c93602bd2e3105e47b66fde | |
parent | 048e5e6ffa2c7e77a0bba3b9d776ed4f0e043ab9 (diff) | |
download | lvm2-0b4f874469aaee20f4a16d0c4261a6226fdfac90.tar.gz |
vg_write: remove unused pvs_to_create
vg_write() no longer needs to create pvs because
pvcreate, vgextend, and vgcreate all use
pvcreate_each_device from toollib.
-rw-r--r-- | lib/metadata/metadata.c | 18 | ||||
-rw-r--r-- | lib/metadata/vg.c | 1 | ||||
-rw-r--r-- | lib/metadata/vg.h | 7 |
3 files changed, 0 insertions, 26 deletions
diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 763ba8121..c36dedf40 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -179,7 +179,6 @@ void del_pvl_from_vgs(struct volume_group *vg, struct pv_list *pvl) int add_pv_to_vg(struct volume_group *vg, const char *pv_name, struct physical_volume *pv, struct pvcreate_params *pp) { - struct pv_to_create *pvc; struct pv_list *pvl; struct format_instance *fid = vg->fid; struct dm_pool *mem = vg->vgmem; @@ -278,16 +277,6 @@ int add_pv_to_vg(struct volume_group *vg, const char *pv_name, break; } - if (pv->status & UNLABELLED_PV) { - if (!(pvc = dm_pool_zalloc(mem, sizeof(*pvc)))) { - log_error("pv_to_create allocation for '%s' failed", pv_name); - return 0; - } - pvc->pv = pv; - pvc->pp = pp; - dm_list_add(&vg->pvs_to_create, &pvc->list); - } - return 1; } @@ -3089,7 +3078,6 @@ out: int vg_write(struct volume_group *vg) { struct dm_list *mdah; - struct pv_to_create *pv_to_create, *pv_to_create_safe; struct metadata_area *mda; struct lv_list *lvl; int revert = 0, wrote = 0; @@ -3145,12 +3133,6 @@ int vg_write(struct volume_group *vg) memlock_unlock(vg->cmd); vg->seqno++; - dm_list_iterate_items_safe(pv_to_create, pv_to_create_safe, &vg->pvs_to_create) { - if (!_pvcreate_write(vg->cmd, pv_to_create)) - return 0; - dm_list_del(&pv_to_create->list); - } - /* Write to each copy of the metadata area */ dm_list_iterate_items(mda, &vg->fid->metadata_areas_in_use) { if (!mda->ops->vg_write) { diff --git a/lib/metadata/vg.c b/lib/metadata/vg.c index f1005e744..1e406a1c1 100644 --- a/lib/metadata/vg.c +++ b/lib/metadata/vg.c @@ -60,7 +60,6 @@ struct volume_group *alloc_vg(const char *pool_name, struct cmd_context *cmd, } dm_list_init(&vg->pvs); - dm_list_init(&vg->pvs_to_create); dm_list_init(&vg->pvs_outdated); dm_list_init(&vg->lvs); dm_list_init(&vg->tags); diff --git a/lib/metadata/vg.h b/lib/metadata/vg.h index 6ff77cf87..a3b3362a4 100644 --- a/lib/metadata/vg.h +++ b/lib/metadata/vg.h @@ -86,13 +86,6 @@ struct volume_group { struct dm_list pvs; /* - * List of physical volumes that were used in vgextend but do not carry - * a PV label yet. They need to be pvcreate'd at vg_write time. - */ - - struct dm_list pvs_to_create; - - /* * List of physical volumes that carry outdated metadata that belongs * to this VG. Currently only populated when lvmetad is in use. The PVs * on this list could still belong to the VG (but their MDA carries an |