diff options
author | David Teigland <teigland@redhat.com> | 2019-02-05 13:24:23 -0600 |
---|---|---|
committer | David Teigland <teigland@redhat.com> | 2019-05-24 12:00:41 -0500 |
commit | ebd4f96f3a66a7db03789b87a7e841adf7645cb1 (patch) | |
tree | 069a01cf7d9ad43da83c50d813539d6c670ff262 | |
parent | 57787592e0b05312e3d76ac39a7d90c803c0038e (diff) | |
download | lvm2-ebd4f96f3a66a7db03789b87a7e841adf7645cb1.tar.gz |
add mda arg to add_mda
Allow the caller of lvmcache_add_mda() to have the
new mda returned.
-rw-r--r-- | lib/cache/lvmcache.c | 5 | ||||
-rw-r--r-- | lib/cache/lvmcache.h | 3 | ||||
-rw-r--r-- | lib/format_text/format-text.c | 2 | ||||
-rw-r--r-- | lib/format_text/format-text.h | 3 | ||||
-rw-r--r-- | lib/format_text/text_label.c | 7 |
5 files changed, 13 insertions, 7 deletions
diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index 3015f4278..669cea4e8 100644 --- a/lib/cache/lvmcache.c +++ b/lib/cache/lvmcache.c @@ -2081,9 +2081,10 @@ void lvmcache_del_bas(struct lvmcache_info *info) } int lvmcache_add_mda(struct lvmcache_info *info, struct device *dev, - uint64_t start, uint64_t size, unsigned ignored) + uint64_t start, uint64_t size, unsigned ignored, + struct metadata_area **mda_new) { - return add_mda(info->fmt, NULL, &info->mdas, dev, start, size, ignored); + return add_mda(info->fmt, NULL, &info->mdas, dev, start, size, ignored, mda_new); } int lvmcache_add_da(struct lvmcache_info *info, uint64_t start, uint64_t size) diff --git a/lib/cache/lvmcache.h b/lib/cache/lvmcache.h index 16cbb4874..21f29ef90 100644 --- a/lib/cache/lvmcache.h +++ b/lib/cache/lvmcache.h @@ -129,7 +129,8 @@ void lvmcache_del_mdas(struct lvmcache_info *info); void lvmcache_del_das(struct lvmcache_info *info); void lvmcache_del_bas(struct lvmcache_info *info); int lvmcache_add_mda(struct lvmcache_info *info, struct device *dev, - uint64_t start, uint64_t size, unsigned ignored); + uint64_t start, uint64_t size, unsigned ignored, + struct metadata_area **mda_new); int lvmcache_add_da(struct lvmcache_info *info, uint64_t start, uint64_t size); int lvmcache_add_ba(struct lvmcache_info *info, uint64_t start, uint64_t size); diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index df55be836..0755c36ba 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -1699,7 +1699,7 @@ static int _text_pv_write(const struct format_type *fmt, struct physical_volume // if fmt is not the same as info->fmt we are in trouble if (!lvmcache_add_mda(info, mdac->area.dev, mdac->area.start, mdac->area.size, - mda_is_ignored(mda))) + mda_is_ignored(mda), NULL)) return_0; } diff --git a/lib/format_text/format-text.h b/lib/format_text/format-text.h index 6be237bc4..2db4871ae 100644 --- a/lib/format_text/format-text.h +++ b/lib/format_text/format-text.h @@ -61,7 +61,8 @@ int add_ba(struct dm_pool *mem, struct dm_list *eas, uint64_t start, uint64_t size); void del_bas(struct dm_list *bas); int add_mda(const struct format_type *fmt, struct dm_pool *mem, struct dm_list *mdas, - struct device *dev, uint64_t start, uint64_t size, unsigned ignored); + struct device *dev, uint64_t start, uint64_t size, unsigned ignored, + struct metadata_area **mda_new); void del_mdas(struct dm_list *mdas); /* On disk */ diff --git a/lib/format_text/text_label.c b/lib/format_text/text_label.c index 6eca3c110..5f4bcfd8e 100644 --- a/lib/format_text/text_label.c +++ b/lib/format_text/text_label.c @@ -243,7 +243,8 @@ void del_bas(struct dm_list *bas) /* FIXME: refactor this function with other mda constructor code */ int add_mda(const struct format_type *fmt, struct dm_pool *mem, struct dm_list *mdas, - struct device *dev, uint64_t start, uint64_t size, unsigned ignored) + struct device *dev, uint64_t start, uint64_t size, unsigned ignored, + struct metadata_area **mda_new) { /* FIXME List size restricted by pv_header SECTOR_SIZE */ struct metadata_area *mdal, *mda; @@ -295,6 +296,8 @@ int add_mda(const struct format_type *fmt, struct dm_pool *mem, struct dm_list * mda_set_ignored(mdal, ignored); dm_list_add(mdas, &mdal->list); + if (mda_new) + *mda_new = mdal; return 1; } @@ -408,7 +411,7 @@ static int _text_read(struct labeller *l, struct device *dev, void *label_buf, /* Metadata area headers */ dlocn_xl++; while ((offset = xlate64(dlocn_xl->offset))) { - lvmcache_add_mda(info, dev, offset, xlate64(dlocn_xl->size), 0); + lvmcache_add_mda(info, dev, offset, xlate64(dlocn_xl->size), 0, NULL); dlocn_xl++; } |