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

dev-cache: remove spurious error msg if no value found in /sys/dev/block/<major>:<minor>/dm/uuid during dev scan

Browse Source 
It's correct to have a DM device that has no DM UUID assigned
so no need to issue error message in this case. Also, if the
device doesn't have DM UUID, it's also clear it's not an LVM LV
(...when looking for VGID/LVID while creating VGID/LVID indices
in dev cache).

For example:

$ dmsetup create test --table "0 1 linear /dev/sda 0"
And there's no PV in the system.

Before this patch (spurious error message issued):
$ pvs
  _get_sysfs_value: /sys/dev/block/253:2/dm/uuid: no value

With this patch applied (no spurious error message):
$ pvs
This commit is contained in:
Peter Rajnoha 2016-03-30 11:11:37 +02:00
parent 8c27c52749
commit 52e0d0db44
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.149 - Version 2.02.149 -
================================== ==================================
Remove spurious error about no value in /sys/dev/block/major:minor/dm/uuid.
Fix device mismatch detection for LV if persistent .cache file is used. Fix device mismatch detection for LV if persistent .cache file is used.
Fix holder device not being found in /dev while sysfs has it during dev scan. Fix holder device not being found in /dev while sysfs has it during dev scan.

12
lib/device/dev-cache.c
View File

@ -363,7 +363,7 @@ static int _add_alias(struct device *dev, const char *path)
return 1; return 1;
} }
static int _get_sysfs_value(const char *path, char *buf, size_t buf_size) static int _get_sysfs_value(const char *path, char *buf, size_t buf_size, int error_if_no_value)
{ {
FILE *fp; FILE *fp;
size_t len; size_t len;
@ -380,8 +380,10 @@ static int _get_sysfs_value(const char *path, char *buf, size_t buf_size)
} }
if (!(len = strlen(buf)) || (len == 1 && buf[0] == '\n')) { if (!(len = strlen(buf)) || (len == 1 && buf[0] == '\n')) {
log_error("_get_sysfs_value: %s: no value", path); if (error_if_no_value) {
goto out; log_error("_get_sysfs_value: %s: no value", path);
goto out;
}
} }
if (buf[len - 1] == '\n') if (buf[len - 1] == '\n')
@ -404,7 +406,7 @@ static int _get_dm_uuid_from_sysfs(char *buf, size_t buf_size, int major, int mi
return 0; return 0;
} }
return _get_sysfs_value(path, buf, buf_size); return _get_sysfs_value(path, buf, buf_size, 0);
} }
static struct dm_list *_get_or_add_list_by_index_key(struct dm_hash_table *idx, const char *key) static struct dm_list *_get_or_add_list_by_index_key(struct dm_hash_table *idx, const char *key)
@ -442,7 +444,7 @@ static struct device *_get_device_for_sysfs_dev_name_using_devno(const char *dev
return NULL; return NULL;
} }
if (!_get_sysfs_value(path, buf, sizeof(buf))) if (!_get_sysfs_value(path, buf, sizeof(buf), 1))
return_NULL; return_NULL;
if (sscanf(buf, "%d:%d", &major, &minor) != 2) { if (sscanf(buf, "%d:%d", &major, &minor) != 2) {