diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2021-10-15 14:42:10 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2021-10-15 23:36:22 +0200 |
| commit | 2779830a060730801ae6b055c2332301bf913c0f (patch) | |
| tree | ed53684164cce5379f1e7bb9bf82880afdcbf35a | |
| parent | 8aefd97252ab5cde9811d93138239f3defeee73b (diff) | |
| download | lvm2-2779830a060730801ae6b055c2332301bf913c0f.tar.gz | |
cov: avoid using NULL info
Check lvmcache info exists before calling lvmcache_del_save_bad_mda().
| -rw-r--r-- | lib/format_text/format-text.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index 941a34944..00443faa1 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -465,7 +465,7 @@ static struct volume_group *_vg_read_raw(struct cmd_context *cmd, vg = _vg_read_raw_area(cmd, fid, vgname, &mdac->area, vg_fmtdata, use_previous_vg, 0, mda_is_primary(mda)); - if (!vg && !*use_previous_vg) { + if (!vg && use_previous_vg && !*use_previous_vg) { /* * This condition (corrupt metadata text) is often seen in the * label_scan()/_text_read() phase, where this code corresponds to @@ -477,8 +477,12 @@ static struct volume_group *_vg_read_raw(struct cmd_context *cmd, struct lvmcache_info *info = lvmcache_info_from_pvid(dev->pvid, dev, 0); log_warn("WARNING: reading %s mda%d failed to read metadata.", dev_name(dev), mda_is_primary(mda)?1:2); log_warn("WARNING: repair VG metadata on %s with vgck --updatemetadata.", dev_name(dev)); - /* remove mda from lvmcache, saving it in info->bad_mdas for possible repair with updatemetadata */ - lvmcache_del_save_bad_mda(info, mda->mda_num, BAD_MDA_TEXT); + if (info) + /* remove mda from lvmcache, saving it in info->bad_mdas for possible repair with updatemetadata */ + lvmcache_del_save_bad_mda(info, mda->mda_num, BAD_MDA_TEXT); + else + log_warn("WARNING: No cache info for %s", dev_name(dev)); + /* remove mda from fid */ fid_remove_mda(fid, mda, NULL, 0, 0); } |