fix last checkin

diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c
index 05e908d1315aa497d0abbb0e13bde0865080beea..e5e5fbe18dc49f31a072c0307cbca646ac587c80 100644 (file)
--- a/lib/cache/lvmcache.c
+++ b/lib/cache/lvmcache.c
@@ -605,9 +605,9 @@ struct volume_group *lvmcache_get_vg(const char *vgid, unsigned precommitted)
            (!precommitted && vginfo->precommitted && !memlock()))
                return NULL;
 
-       if (!(fid =  vginfo->fmt->ops->create_instance(vginfo->fmt,
-                                                      vginfo->vgname,
-                                                      vgid, NULL)))
+       if (!(fid = vginfo->fmt->ops->create_instance(vginfo->fmt,
+                                                     vginfo->vgname,
+                                                     vgid, NULL)))
                return_NULL;
 
        if (!(vg = import_vg_from_buffer(vginfo->vgmetadata, fid)) ||
@@ -733,7 +733,8 @@ struct device *device_from_pvid(struct cmd_context *cmd, struct id *pvid,
                return NULL;
 
        lvmcache_label_scan(cmd, 2);
-       *scan_done_once = 1;
+       if (scan_done_once)
+               *scan_done_once = 1;
 
        /* Try again */
        if ((info = info_from_pvid((char *) pvid, 0))) {