Rename fid->metadata_areas to fid->metadata_areas_in_use.

Rename the metadata_areas list to an 'in_use' list to prepare for
future 'ignored' list.

diff --git a/lib/format1/format1.c b/lib/format1/format1.c
index 1167e04523596fb3c1cf2bc45e7d4e73e91b4d09..495f0c711d06a4ee8776c802b188ccb56d5ff246 100644 (file)
--- a/lib/format1/format1.c
+++ b/lib/format1/format1.c
@@ -463,7 +463,7 @@ static struct format_instance *_format1_create_instance(const struct format_type
                return_NULL;
 
        fid->fmt = fmt;
-       dm_list_init(&fid->metadata_areas);
+       dm_list_init(&fid->metadata_areas_in_use);
 
        /* Define a NULL metadata area */
        if (!(mda = dm_pool_alloc(fmt->cmd->mem, sizeof(*mda)))) {
@@ -473,7 +473,7 @@ static struct format_instance *_format1_create_instance(const struct format_type
 
        mda->ops = &_metadata_format1_ops;
        mda->metadata_locn = NULL;
-       dm_list_add(&fid->metadata_areas, &mda->list);
+       dm_list_add(&fid->metadata_areas_in_use, &mda->list);
 
        return fid;
 }

diff --git a/lib/format_pool/format_pool.c b/lib/format_pool/format_pool.c
index d8a09ec45014519978f1f77961f9561dc328632d..01bf65899e3df36af8a49d7f2da18f57cbecda9c 100644 (file)
--- a/lib/format_pool/format_pool.c
+++ b/lib/format_pool/format_pool.c
@@ -262,7 +262,7 @@ static struct format_instance *_pool_create_instance(const struct format_type *f
        }
 
        fid->fmt = fmt;
-       dm_list_init(&fid->metadata_areas);
+       dm_list_init(&fid->metadata_areas_in_use);
 
        /* Define a NULL metadata area */
        if (!(mda = dm_pool_zalloc(fmt->cmd->mem, sizeof(*mda)))) {
@@ -274,7 +274,7 @@ static struct format_instance *_pool_create_instance(const struct format_type *f
 
        mda->ops = &_metadata_format_pool_ops;
        mda->metadata_locn = NULL;
-       dm_list_add(&fid->metadata_areas, &mda->list);
+       dm_list_add(&fid->metadata_areas_in_use, &mda->list);
 
        return fid;
 }

diff --git a/lib/format_text/archiver.c b/lib/format_text/archiver.c
index 41381dd07d3e5d77815e78163c8e13ac3d40be21..bccd98f8b294a707c15c50c47884a583e46d1384 100644 (file)
--- a/lib/format_text/archiver.c
+++ b/lib/format_text/archiver.c
@@ -277,7 +277,7 @@ struct volume_group *backup_read_vg(struct cmd_context *cmd,
                return NULL;
        }
 
-       dm_list_iterate_items(mda, &tf->metadata_areas) {
+       dm_list_iterate_items(mda, &tf->metadata_areas_in_use) {
                if (!(vg = mda->ops->vg_read(tf, vg_name, mda)))
                        stack;
                break;
@@ -327,7 +327,7 @@ int backup_restore_vg(struct cmd_context *cmd, struct volume_group *vg)
                }
                if (!vg->fid->fmt->ops->
                    pv_setup(vg->fid->fmt, UINT64_C(0), 0, 0, 0, 0, 0UL,
-                            UINT64_C(0), &vg->fid->metadata_areas, pv, vg)) {
+                            UINT64_C(0), &vg->fid->metadata_areas_in_use, pv, vg)) {
                        log_error("Format-specific setup for %s failed",
                                  pv_dev_name(pv));
                        return 0;
@@ -397,7 +397,7 @@ int backup_to_file(const char *file, const char *desc, struct volume_group *vg)
        }
 
        /* Write and commit the metadata area */
-       dm_list_iterate_items(mda, &tf->metadata_areas) {
+       dm_list_iterate_items(mda, &tf->metadata_areas_in_use) {
                if (!(r = mda->ops->vg_write(tf, vg, mda))) {
                        stack;
                        continue;

diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c
index ee55d90c11eca839c00109a25903e449e5c3a7c3..db352eaa762d8e255afc0d7b28de4f334a70506f 100644 (file)
--- a/lib/format_text/format-text.c
+++ b/lib/format_text/format-text.c
@@ -1208,7 +1208,7 @@ static int _scan_raw(const struct format_type *fmt)
        raw_list = &((struct mda_lists *) fmt->private)->raws;
 
        fid.fmt = fmt;
-       dm_list_init(&fid.metadata_areas);
+       dm_list_init(&fid.metadata_areas_in_use);
 
        dm_list_iterate_items(rl, raw_list) {
                /* FIXME We're reading mdah twice here... */
@@ -1914,14 +1914,14 @@ static struct format_instance *_text_create_text_instance(const struct format_ty
        fid->private = (void *) fidtc;
 
        fid->fmt = fmt;
-       dm_list_init(&fid->metadata_areas);
+       dm_list_init(&fid->metadata_areas_in_use);
 
        if (!vgname) {
                if (!(mda = dm_pool_alloc(fmt->cmd->mem, sizeof(*mda))))
                        return_NULL;
                mda->ops = &_metadata_text_file_backup_ops;
                mda->metadata_locn = context;
-               dm_list_add(&fid->metadata_areas, &mda->list);
+               dm_list_add(&fid->metadata_areas_in_use, &mda->list);
        } else {
                dir_list = &((struct mda_lists *) fmt->private)->dirs;
 
@@ -1938,7 +1938,7 @@ static struct format_instance *_text_create_text_instance(const struct format_ty
                                return_NULL;
                        mda->ops = &_metadata_text_file_ops;
                        mda->metadata_locn = context;
-                       dm_list_add(&fid->metadata_areas, &mda->list);
+                       dm_list_add(&fid->metadata_areas_in_use, &mda->list);
                }
 
                raw_list = &((struct mda_lists *) fmt->private)->raws;
@@ -1958,7 +1958,7 @@ static struct format_instance *_text_create_text_instance(const struct format_ty
                        memcpy(&mdac->area, &rl->dev_area, sizeof(mdac->area));
                        mda->ops = &_metadata_text_raw_ops;
                        /* FIXME MISTAKE? mda->metadata_locn = context; */
-                       dm_list_add(&fid->metadata_areas, &mda->list);
+                       dm_list_add(&fid->metadata_areas_in_use, &mda->list);
                }
 
                /* Scan PVs in VG for any further MDAs */
@@ -1972,7 +1972,7 @@ static struct format_instance *_text_create_text_instance(const struct format_ty
                                mda_new = mda_copy(fmt->cmd->mem, mda);
                                if (!mda_new)
                                        return_NULL;
-                               dm_list_add(&fid->metadata_areas, &mda_new->list);
+                               dm_list_add(&fid->metadata_areas_in_use, &mda_new->list);
                        }
                }
                /* FIXME Check raw metadata area count - rescan if required */

diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index dbac0f2f5606513fc13cb819e5fa79869fd3247c..6923c4059040bf866bcb5866359a2415efd8e0e9 100644 (file)
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -215,7 +215,7 @@ struct physical_volume {
 
 struct format_instance {
        const struct format_type *fmt;
-       struct dm_list metadata_areas;  /* e.g. metadata locations */
+       struct dm_list metadata_areas_in_use;   /* e.g. metadata locations */
        void *private;
 };
 

diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index be624ca172d013e185ef87382ced376e9ff806fc..74f1fa455b1e0ad52879061ad8278bfc7083446a 100644 (file)
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -217,7 +217,7 @@ int add_pv_to_vg(struct volume_group *vg, const char *pv_name,
 
        if (!fid->fmt->ops->pv_setup(fid->fmt, UINT64_C(0), 0,
                                     vg->extent_size, 0, 0, 0UL, UINT64_C(0),
-                                    &fid->metadata_areas, pv, vg)) {
+                                    &fid->metadata_areas_in_use, pv, vg)) {
                log_error("Format-specific setup of physical volume '%s' "
                          "failed.", pv_name);
                return 0;
@@ -1255,8 +1255,8 @@ int vg_split_mdas(struct cmd_context *cmd __attribute((unused)),
        struct dm_list *mdas_from, *mdas_to;
        int common_mda = 0;
 
-       mdas_from = &vg_from->fid->metadata_areas;
-       mdas_to = &vg_to->fid->metadata_areas;
+       mdas_from = &vg_from->fid->metadata_areas_in_use;
+       mdas_to = &vg_to->fid->metadata_areas_in_use;
 
        dm_list_iterate_items_safe(mda, mda2, mdas_from) {
                if (!mda->ops->mda_in_vg) {
@@ -1844,7 +1844,7 @@ int vg_remove_mdas(struct volume_group *vg)
 
        /* FIXME Improve recovery situation? */
        /* Remove each copy of the metadata */
-       dm_list_iterate_items(mda, &vg->fid->metadata_areas) {
+       dm_list_iterate_items(mda, &vg->fid->metadata_areas_in_use) {
                if (mda->ops->vg_remove &&
                    !mda->ops->vg_remove(vg->fid, vg, mda))
                        return_0;
@@ -2362,7 +2362,7 @@ int vg_write(struct volume_group *vg)
        }
 
 
-       if (dm_list_empty(&vg->fid->metadata_areas)) {
+       if (dm_list_empty(&vg->fid->metadata_areas_in_use)) {
                log_error("Aborting vg_write: No metadata areas to write to!");
                return 0;
        }
@@ -2375,12 +2375,12 @@ int vg_write(struct volume_group *vg)
        vg->seqno++;
 
        /* Write to each copy of the metadata area */
-       dm_list_iterate_items(mda, &vg->fid->metadata_areas) {
+       dm_list_iterate_items(mda, &vg->fid->metadata_areas_in_use) {
                if (!mda->ops->vg_write) {
                        log_error("Format does not support writing volume"
                                  "group metadata areas");
                        /* Revert */
-                       dm_list_uniterate(mdah, &vg->fid->metadata_areas, &mda->list) {
+                       dm_list_uniterate(mdah, &vg->fid->metadata_areas_in_use, &mda->list) {
                                mda = dm_list_item(mdah, struct metadata_area);
 
                                if (mda->ops->vg_revert &&
@@ -2393,7 +2393,7 @@ int vg_write(struct volume_group *vg)
                if (!mda->ops->vg_write(vg->fid, vg, mda)) {
                        stack;
                        /* Revert */
-                       dm_list_uniterate(mdah, &vg->fid->metadata_areas, &mda->list) {
+                       dm_list_uniterate(mdah, &vg->fid->metadata_areas_in_use, &mda->list) {
                                mda = dm_list_item(mdah, struct metadata_area);
 
                                if (mda->ops->vg_revert &&
@@ -2406,12 +2406,12 @@ int vg_write(struct volume_group *vg)
        }
 
        /* Now pre-commit each copy of the new metadata */
-       dm_list_iterate_items(mda, &vg->fid->metadata_areas) {
+       dm_list_iterate_items(mda, &vg->fid->metadata_areas_in_use) {
                if (mda->ops->vg_precommit &&
                    !mda->ops->vg_precommit(vg->fid, vg, mda)) {
                        stack;
                        /* Revert */
-                       dm_list_iterate_items(mda, &vg->fid->metadata_areas) {
+                       dm_list_iterate_items(mda, &vg->fid->metadata_areas_in_use) {
                                if (mda->ops->vg_revert &&
                                    !mda->ops->vg_revert(vg->fid, vg, mda)) {
                                        stack;
@@ -2438,7 +2438,7 @@ int vg_commit(struct volume_group *vg)
        }
 
        /* Commit to each copy of the metadata area */
-       dm_list_iterate_items(mda, &vg->fid->metadata_areas) {
+       dm_list_iterate_items(mda, &vg->fid->metadata_areas_in_use) {
                failed = 0;
                if (mda->ops->vg_commit &&
                    !mda->ops->vg_commit(vg->fid, vg, mda)) {
@@ -2476,7 +2476,7 @@ int vg_revert(struct volume_group *vg)
 {
        struct metadata_area *mda;
 
-       dm_list_iterate_items(mda, &vg->fid->metadata_areas) {
+       dm_list_iterate_items(mda, &vg->fid->metadata_areas_in_use) {
                if (mda->ops->vg_revert &&
                    !mda->ops->vg_revert(vg->fid, vg, mda)) {
                        stack;
@@ -2691,7 +2691,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd,
                return_NULL;
 
        /* Ensure contents of all metadata areas match - else do recovery */
-       dm_list_iterate_items(mda, &fid->metadata_areas) {
+       dm_list_iterate_items(mda, &fid->metadata_areas_in_use) {
                if ((use_precommitted &&
                     !(vg = mda->ops->vg_read_precommit(fid, vgname, mda))) ||
                    (!use_precommitted &&
@@ -2809,7 +2809,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd,
                }
 
                /* Ensure contents of all metadata areas match - else recover */
-               dm_list_iterate_items(mda, &fid->metadata_areas) {
+               dm_list_iterate_items(mda, &fid->metadata_areas_in_use) {
                        if ((use_precommitted &&
                             !(vg = mda->ops->vg_read_precommit(fid, vgname,
                                                                mda))) ||
@@ -3897,8 +3897,8 @@ struct metadata_area *mda_copy(struct dm_pool *mem,
  * physical_volume.  The location of the mda depends on whether
  * the PV is in a volume group.  A PV not in a VG has an mda on the
  * 'info->mda' list in lvmcache, while a PV in a VG has an mda on
- * the vg->fid->metadata_areas list.  For further details, see _vg_read(),
- * and the sequence of creating the format_instance with fid->metadata_areas
+ * the vg->fid->metadata_areas_in_use list.  For further details, see _vg_read(),
+ * and the sequence of creating the format_instance with fid->metadata_areas_in_use
  * list, as well as the construction of the VG, with list of PVs (comes
  * after the construction of the fid and list of mdas).
  */
@@ -3984,7 +3984,7 @@ uint64_t vg_max_lv(const struct volume_group *vg)
 
 uint32_t vg_mda_count(const struct volume_group *vg)
 {
-       return dm_list_size(&vg->fid->metadata_areas);
+       return dm_list_size(&vg->fid->metadata_areas_in_use);
 }
 
 uint64_t lv_size(const struct logical_volume *lv)

diff --git a/lib/metadata/metadata.h b/lib/metadata/metadata.h
index 2a849765a6fb1bd74f796be65216946c5dbcf6e6..419ad43129fa2283606618315cd16ddbca6de1ac 100644 (file)
--- a/lib/metadata/metadata.h
+++ b/lib/metadata/metadata.h
@@ -162,8 +162,8 @@ struct metadata_area_ops {
                               struct metadata_area *mda);
 
        /*
-        * Do these two metadata_areas match with respect to their underlying
-        * location?
+        * Do these two metadata_area structures match with respect to
+        * their underlying location?
         */
        unsigned (*mda_locns_match)(struct metadata_area *mda1,
                                    struct metadata_area *mda2);

diff --git a/lib/report/report.c b/lib/report/report.c
index f71a46f819a19913c39f95f2ff03f1b34af95a11..12fc79109fdf24c5af76de83750d0563a69223ae 100644 (file)
--- a/lib/report/report.c
+++ b/lib/report/report.c
@@ -957,7 +957,7 @@ static int _vgmdasize_disp(struct dm_report *rh, struct dm_pool *mem,
        const struct volume_group *vg = (const struct volume_group *) data;
        uint64_t min_mda_size;
 
-       min_mda_size = _find_min_mda_size(&vg->fid->metadata_areas);
+       min_mda_size = _find_min_mda_size(&vg->fid->metadata_areas_in_use);
 
        return _size64_disp(rh, mem, field, &min_mda_size, private);
 }
@@ -970,7 +970,7 @@ static int _vgmdafree_disp(struct dm_report *rh, struct dm_pool *mem,
        uint64_t freespace = UINT64_MAX, mda_free;
        struct metadata_area *mda;
 
-       dm_list_iterate_items(mda, &vg->fid->metadata_areas) {
+       dm_list_iterate_items(mda, &vg->fid->metadata_areas_in_use) {
                if (!mda->ops->mda_free_sectors)
                        continue;
                mda_free = mda->ops->mda_free_sectors(mda);
@@ -1126,7 +1126,7 @@ static int _copypercent_disp(struct dm_report *rh __attribute((unused)),
 
 /* necessary for displaying something for PVs not belonging to VG */
 static struct format_instance _dummy_fid = {
-       .metadata_areas = { &(_dummy_fid.metadata_areas), &(_dummy_fid.metadata_areas) },
+       .metadata_areas_in_use = { &(_dummy_fid.metadata_areas_in_use), &(_dummy_fid.metadata_areas_in_use) },
 };
 
 static struct volume_group _dummy_vg = {

diff --git a/tools/vgmerge.c b/tools/vgmerge.c
index 299bed7d669f0c44950a1db214bc66a5d00011cb..c5149a930b928ae19c514d25c6341dce9d5a4f38 100644 (file)
--- a/tools/vgmerge.c
+++ b/tools/vgmerge.c
@@ -120,10 +120,10 @@ static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to,
                dm_list_move(&vg_to->lvs, lvh);
        }
 
-       while (!dm_list_empty(&vg_from->fid->metadata_areas)) {
-               struct dm_list *mdah = vg_from->fid->metadata_areas.n;
+       while (!dm_list_empty(&vg_from->fid->metadata_areas_in_use)) {
+               struct dm_list *mdah = vg_from->fid->metadata_areas_in_use.n;
 
-               dm_list_move(&vg_to->fid->metadata_areas, mdah);
+               dm_list_move(&vg_to->fid->metadata_areas_in_use, mdah);
        }
 
        vg_to->extent_count += vg_from->extent_count;