mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-30 17:18:21 +03:00
cleanup: improve messages
Add verbose message when we will not obtain devices from udev (i.e. testing is using different udev dir, and the log was giving misleading info about using udev) Add proper error message if zalloc from pull would have failed. Fix typo obolete -> obsolete
This commit is contained in:
parent
35ab841ecf
commit
2925023411
@ -777,6 +777,9 @@ static int _init_dev_cache(struct cmd_context *cmd)
|
||||
udev_dir_len != len;
|
||||
|
||||
if (len_diff || strncmp(DM_UDEV_DEV_DIR, cv->v.str, len)) {
|
||||
log_very_verbose("Non standard udev dir %s, resetting "
|
||||
"devices/obtain_device_list_from_udev.",
|
||||
cv->v.str);
|
||||
device_list_from_udev = 0;
|
||||
init_obtain_device_list_from_udev(0);
|
||||
}
|
||||
|
@ -64,8 +64,10 @@ struct dm_config_tree *config_file_open(const char *filename, int keep_open)
|
||||
if (!cft)
|
||||
return NULL;
|
||||
|
||||
cf = dm_pool_zalloc(cft->mem, sizeof(struct config_file));
|
||||
if (!cf) goto fail;
|
||||
if (!(cf = dm_pool_zalloc(cft->mem, sizeof(struct config_file)))) {
|
||||
log_error("Failed to allocate condig tree.");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
cf->keep_open = keep_open;
|
||||
dm_config_set_custom(cft, cf);
|
||||
|
@ -103,8 +103,8 @@ int persistent_filter_load(struct dev_filter *f, struct dm_config_tree **cft_out
|
||||
|
||||
if (obtain_device_list_from_udev()) {
|
||||
if (!stat(pf->file, &info)) {
|
||||
log_very_verbose("Obtaining device list from "
|
||||
"udev. Removing obolete %s.",
|
||||
log_very_verbose("Obtaining device list from udev. "
|
||||
"Removing obsolete %s.",
|
||||
pf->file);
|
||||
if (unlink(pf->file) < 0 && errno != EROFS)
|
||||
log_sys_error("unlink", pf->file);
|
||||
|
Loading…
Reference in New Issue
Block a user