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 f3c7411041dbd8c57a24715ac813c696ee472e28..4d59e27f1c9b4977e71500aff80b09ac49e8b86c 100644 (file)
--- 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 08f0d9c7c63ec2570fb5982bbea8763516c25070..115b71ec50382892ed1d6b98786b80989726ec10 100644 (file)
--- 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 241a8ea9d48eeed479dffe07ffed2d0c6ce3d836..8b38854eae0c70f66baf64ef4b1a754e66340341 100644 (file)
--- 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 */