diff options
| author | Alasdair Kergon <agk@redhat.com> | 2012-02-28 18:20:17 +0000 |
|---|---|---|
| committer | Alasdair Kergon <agk@redhat.com> | 2012-02-28 18:20:17 +0000 |
| commit | 03b18d96ad288fdaf83758f58a2796cdc36ad3bd (patch) | |
| tree | 9447cc05297a32d1ad6997dccd76022af22b0780 /lib/cache/lvmcache.c | |
| parent | 832a1e7395ee4929a6d61de75ca16a3004248651 (diff) | |
| download | lvm2-03b18d96ad288fdaf83758f58a2796cdc36ad3bd.tar.gz lvm2-03b18d96ad288fdaf83758f58a2796cdc36ad3bd.tar.xz lvm2-03b18d96ad288fdaf83758f58a2796cdc36ad3bd.zip | |
If lvmetad fails, don't set _has_scanned
Diffstat (limited to 'lib/cache/lvmcache.c')
| -rw-r--r-- | lib/cache/lvmcache.c | 11 |
1 files changed, 8 insertions, 3 deletions
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; }; |