Add copy constructor for struct metadata_area.

Clean up cut&paste code with proper copy constructor.

diff --git a/WHATS_NEW b/WHATS_NEW
index ca98582953358740defb9497ebe04e7ca602ec26..6a6714ea2b5396b96bad0f69b9bd9230f063d672 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.61 - 
 ===================================
+  Add copy constructor for metadata_area.
   Remove pointless versioned symlinks to dmeventd plugin libraries.
   Fix dmeventd snapshot plugin build dependency.
   Make clvmd -V return zero status.

diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c
index 2c750547d05522a3a1bb1c26435845c7d73db203..0c9b5e2f01d4738455bff977ce67b7a00fced3bf 100644 (file)
--- a/lib/format_text/format-text.c
+++ b/lib/format_text/format-text.c
@@ -1548,15 +1548,41 @@ static int _populate_pv_fields(struct lvmcache_info *info,
        return 1;
 }
 
+/*
+ * Copy constructor for a metadata_area.
+ */
+static struct metadata_area *_mda_copy(struct dm_pool *mem,
+                                      struct metadata_area *mda)
+{
+       struct metadata_area *mda_new;
+       struct mda_context *mdac, *mdac_new;
+
+       if (!(mda_new = dm_pool_alloc(mem, sizeof(*mda_new)))) {
+               log_error("metadata_area allocation failed");
+               return NULL;
+       }
+       /* FIXME: Should have a per-format constructor here */
+       mdac = (struct mda_context *) mda->metadata_locn;
+       if (!(mdac_new = dm_pool_alloc(mem, sizeof(*mdac_new)))) {
+               log_error("mda_context allocation failed");
+               dm_pool_free(mem, mda_new);
+               return NULL;
+       }
+       memcpy(mda_new, mda, sizeof(*mda));
+       memcpy(mdac_new, mdac, sizeof(*mdac));
+       mda_new->metadata_locn = mdac_new;
+       return mda_new;
+}
+
+
 static int _text_pv_read(const struct format_type *fmt, const char *pv_name,
                    struct physical_volume *pv, struct dm_list *mdas,
                    int scan_label_only)
 {
+       struct metadata_area *mda, *mda_new;
        struct label *label;
        struct device *dev;
        struct lvmcache_info *info;
-       struct metadata_area *mda, *mda_new;
-       struct mda_context *mdac, *mdac_new;
 
        if (!(dev = dev_cache_get(pv_name, fmt->cmd->filter)))
                return_0;
@@ -1573,18 +1599,9 @@ static int _text_pv_read(const struct format_type *fmt, const char *pv_name,
 
        /* Add copy of mdas to supplied list */
        dm_list_iterate_items(mda, &info->mdas) {
-               mdac = (struct mda_context *) mda->metadata_locn;
-               if (!(mda_new = dm_pool_alloc(fmt->cmd->mem, sizeof(*mda_new)))) {
-                       log_error("metadata_area allocation failed");
-                       return 0;
-               }
-               if (!(mdac_new = dm_pool_alloc(fmt->cmd->mem, sizeof(*mdac_new)))) {
-                       log_error("metadata_area allocation failed");
+               mda_new = _mda_copy(fmt->cmd->mem, mda);
+               if (!mda_new)
                        return 0;
-               }
-               memcpy(mda_new, mda, sizeof(*mda));
-               memcpy(mdac_new, mdac, sizeof(*mdac));
-               mda_new->metadata_locn = mdac_new;
                dm_list_add(mdas, &mda_new->list);
        }
 
@@ -1672,7 +1689,7 @@ static int _text_pv_setup(const struct format_type *fmt,
                     struct physical_volume *pv, struct volume_group *vg)
 {
        struct metadata_area *mda, *mda_new, *mda2;
-       struct mda_context *mdac, *mdac_new, *mdac2;
+       struct mda_context *mdac, *mdac2;
        struct dm_list *pvmdas;
        struct lvmcache_info *info;
        int found;
@@ -1718,18 +1735,11 @@ static int _text_pv_setup(const struct format_type *fmt,
                                if (found)
                                        continue;
 
-                               if (!(mda_new = dm_pool_alloc(fmt->cmd->mem,
-                                                          sizeof(*mda_new))))
+                               mda_new = _mda_copy(fmt->cmd->mem, mda);
+                               if (!mda_new)
                                        return_0;
-
-                               if (!(mdac_new = dm_pool_alloc(fmt->cmd->mem,
-                                                           sizeof(*mdac_new))))
-                                       return_0;
-                               /* FIXME multiple dev_areas inside area */
-                               memcpy(mda_new, mda, sizeof(*mda));
-                               memcpy(mdac_new, mdac, sizeof(*mdac));
-                               mda_new->metadata_locn = mdac_new;
                                dm_list_add(mdas, &mda_new->list);
+                               /* FIXME multiple dev_areas inside area */
                        }
                }
 
@@ -1815,7 +1825,7 @@ static struct format_instance *_text_create_text_instance(const struct format_ty
        struct format_instance *fid;
        struct text_fid_context *fidtc;
        struct metadata_area *mda, *mda_new;
-       struct mda_context *mdac, *mdac_new;
+       struct mda_context *mdac;
        struct dir_list *dl;
        struct raw_list *rl;
        struct dm_list *dir_list, *raw_list, *mdas;
@@ -1892,21 +1902,10 @@ static struct format_instance *_text_create_text_instance(const struct format_ty
                dm_list_iterate_items(info, &vginfo->infos) {
                        mdas = &info->mdas;
                        dm_list_iterate_items(mda, mdas) {
-                               mdac =
-                                   (struct mda_context *) mda->metadata_locn;
-
                                /* FIXME Check it holds this VG */
-                               if (!(mda_new = dm_pool_alloc(fmt->cmd->mem,
-                                                          sizeof(*mda_new))))
-                                       return_NULL;
-
-                               if (!(mdac_new = dm_pool_alloc(fmt->cmd->mem,
-                                                           sizeof(*mdac_new))))
+                               mda_new = _mda_copy(fmt->cmd->mem, mda);
+                               if (!mda_new)
                                        return_NULL;
-                               /* FIXME multiple dev_areas inside area */
-                               memcpy(mda_new, mda, sizeof(*mda));
-                               memcpy(mdac_new, mdac, sizeof(*mdac));
-                               mda_new->metadata_locn = mdac_new;
                                dm_list_add(&fid->metadata_areas, &mda_new->list);
                        }
                }