From: Alasdair Kergon <agk@redhat.com>
Date: Mon, 12 Apr 2010 11:52:53 +0000 (+0000)
Subject: Don't ignore error if resuming any LV fails in resume_lvs.
X-Git-Tag: v2_02_91~2081
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=069309922336f0738aa105e73aa28a8ae6f8477d;p=lvm2.git

Don't ignore error if resuming any LV fails in resume_lvs.
Skip closing persistent filter cache file if open failed.
---

diff --git a/WHATS_NEW b/WHATS_NEW
index f3c741104..4d59e27f1 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,7 @@
 Version 2.02.63 -  
 ================================
+  Don't ignore error if resuming any LV fails in resume_lvs.
+  Skip closing persistent filter cache file if open failed.
   Install .a .so links to $(usrlibdir).
   Add --enable-write_install options to install user writable files.
   Use INSTALL_PROGRAM/DATA/WDATA target.
diff --git a/lib/config/config.c b/lib/config/config.c
index 08f0d9c7c..115b71ec5 100644
--- a/lib/config/config.c
+++ b/lib/config/config.c
@@ -295,8 +295,10 @@ int read_config_file(struct config_tree *cft)
 		if (!(c->dev = dev_create_file(c->filename, NULL, NULL, 1)))
 			return_0;
 
-		if (!dev_open_flags(c->dev, O_RDONLY, 0, 0))
+		if (!dev_open_flags(c->dev, O_RDONLY, 0, 0)) {
+			c->dev = 0;
 			return_0;
+		}
 	}
 
 	r = read_config_fd(cft, c->dev, 0, (size_t) info.st_size, 0, 0,
diff --git a/lib/locking/locking.c b/lib/locking/locking.c
index 241a8ea9d..8b38854ea 100644
--- a/lib/locking/locking.c
+++ b/lib/locking/locking.c
@@ -468,12 +468,15 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags)
 int resume_lvs(struct cmd_context *cmd, struct dm_list *lvs)
 {
 	struct lv_list *lvl;
+	int r = 1;
 
 	dm_list_iterate_items(lvl, lvs)
-		if (!resume_lv(cmd, lvl->lv))
+		if (!resume_lv(cmd, lvl->lv)) {
+			r = 0;
 			stack;
+		}
 
-	return 1;
+	return r;
 }
 
 /* Lock a list of LVs */