diff --git a/WHATS_NEW b/WHATS_NEW index 5d4c7a724..c1324de2c 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.99 - =================================== + Fix assignment order for vg fid for lvm1 and pool format. Fix memleak in dmeventd thin plugin in device list obtaining err path. Add explicit message about unsupported pvmove for thin/thinpool volumes. Fix lvmetad error path in lvmetad_vg_lookup() for null vgname. diff --git a/lib/format1/format1.c b/lib/format1/format1.c index f47ed9523..286422751 100644 --- a/lib/format1/format1.c +++ b/lib/format1/format1.c @@ -200,8 +200,6 @@ static struct volume_group *_format1_vg_read(struct format_instance *fid, if (dm_list_empty(&pvs)) goto_bad; - vg_set_fid(vg, fid); - if (!_check_vgs(&pvs, vg)) goto_bad; @@ -226,6 +224,8 @@ static struct volume_group *_format1_vg_read(struct format_instance *fid, if ((vg->status & PARTIAL_VG) && !_fix_partial_vg(vg, &pvs)) goto_bad; + vg_set_fid(vg, fid); + return vg; bad: diff --git a/lib/format_pool/format_pool.c b/lib/format_pool/format_pool.c index c05196848..0891524e9 100644 --- a/lib/format_pool/format_pool.c +++ b/lib/format_pool/format_pool.c @@ -122,8 +122,6 @@ static struct volume_group *_pool_vg_read(struct format_instance *fid, if (!read_pool_pds(fid->fmt, vg_name, vg->vgmem, &pds)) goto_bad; - vg_set_fid(vg, fid); - /* Setting pool seqno to 1 because the code always did this, * although we don't think it's needed. */ vg->seqno = 1; @@ -155,6 +153,8 @@ static struct volume_group *_pool_vg_read(struct format_instance *fid, if (!import_pool_segments(&vg->lvs, vg->vgmem, usp, sp_count)) goto_bad; + vg_set_fid(vg, fid); + return vg; bad: