Fallback to full rescan for missing device

Fix bug when NULL could have been passsed as 'data'
to _add_pv_to_list() if 'dev' is NULL.

Now it fallbacks to complete scan.

diff --git a/WHATS_NEW b/WHATS_NEW
index 09f9763254bf2785a234de90d8d35aa7145c6e4e..833b8a70df1b214bfc65849e0a88f8572fffb949 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.78 - 
 ====================================
+  Do a full rescan if some device is missing in read_pvs_in_vg().
   Avoid misleading warnings in vgextend --restoremissing in certain cases.
   Add error path stack traces for _process_mapper_dir(), _create_and_load_v4().
   Add missing test for failed pool allocation in write_config_node().

diff --git a/lib/format1/disk-rep.c b/lib/format1/disk-rep.c
index bc58744240e81e6d21859fb28cfc63ac73548216..071b39dd8c3c3da6b6a0c1f32d95f00a0c56fb15 100644 (file)
--- a/lib/format1/disk-rep.c
+++ b/lib/format1/disk-rep.c
@@ -471,7 +471,7 @@ int read_pvs_in_vg(const struct format_type *fmt, const char *vg_name,
            vginfo->infos.n) {
                dm_list_iterate_items(info, &vginfo->infos) {
                        dev = info->dev;
-                       if (dev && !(data = read_disk(fmt, dev, mem, vg_name)))
+                       if (!dev || !(data = read_disk(fmt, dev, mem, vg_name)))
                                break;
                        _add_pv_to_list(head, data);
                }