From 03b18d96ad288fdaf83758f58a2796cdc36ad3bd Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@redhat.com>
Date: Tue, 28 Feb 2012 18:20:17 +0000
Subject: If lvmetad fails, don't set _has_scanned

---
 lib/cache/lvmcache.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'lib/cache/lvmcache.c')

diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c
index 8d039688..390328dd 100644
--- a/lib/cache/lvmcache.c
+++ b/lib/cache/lvmcache.c
@@ -116,10 +116,15 @@ int lvmcache_init(void)
 
 void lvmcache_seed_infos_from_lvmetad(struct cmd_context *cmd)
 {
-	if (lvmetad_active() && !_has_scanned) {
-		lvmetad_pv_list_to_lvmcache(cmd);
-		_has_scanned = 1;
+	if (!lvmetad_active() || _has_scanned)
+		return;
+
+	if (!lvmetad_pv_list_to_lvmcache(cmd)) {
+		stack;
+		return;
 	}
+
+	_has_scanned = 1;
 };
 
 
-- 
cgit