1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00

Don't ignore error if resuming any LV fails in resume_lvs.

Skip closing persistent filter cache file if open failed.
This commit is contained in:
Alasdair Kergon 2010-04-12 11:52:53 +00:00
parent d5fdc8e8ab
commit 0693099223
3 changed files with 10 additions and 3 deletions

View File

@ -1,5 +1,7 @@
Version 2.02.63 - 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). Install .a .so links to $(usrlibdir).
Add --enable-write_install options to install user writable files. Add --enable-write_install options to install user writable files.
Use INSTALL_PROGRAM/DATA/WDATA target. Use INSTALL_PROGRAM/DATA/WDATA target.

View File

@ -295,8 +295,10 @@ int read_config_file(struct config_tree *cft)
if (!(c->dev = dev_create_file(c->filename, NULL, NULL, 1))) if (!(c->dev = dev_create_file(c->filename, NULL, NULL, 1)))
return_0; 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; return_0;
}
} }
r = read_config_fd(cft, c->dev, 0, (size_t) info.st_size, 0, 0, r = read_config_fd(cft, c->dev, 0, (size_t) info.st_size, 0, 0,

View File

@ -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) int resume_lvs(struct cmd_context *cmd, struct dm_list *lvs)
{ {
struct lv_list *lvl; struct lv_list *lvl;
int r = 1;
dm_list_iterate_items(lvl, lvs) dm_list_iterate_items(lvl, lvs)
if (!resume_lv(cmd, lvl->lv)) if (!resume_lv(cmd, lvl->lv)) {
r = 0;
stack; stack;
}
return 1; return r;
} }
/* Lock a list of LVs */ /* Lock a list of LVs */