shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00
Code Releases Activity

Fix error handling of device-related stat() calls to be ENOENT aware.

Browse Source 
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
This commit is contained in:
snitzer 2009-08-01 17:14:52 +00:00
parent 2adec6ef66
commit afc5de69d4
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/device/dev-md.c
View File

@ -151,7 +151,11 @@ check_md_major:
return ret;
}
if (stat(path, &info) < 0) {
if (stat(path, &info) == -1) {
if (errno != ENOENT) {
log_sys_error("stat", path);
return ret;
}
/* old sysfs structure */
ret = dm_snprintf(path, size, "%s/block/md%d/md/%s",
sysfs_dir, (int)MINOR(dev), attribute);

23
lib/device/device.c
View File

@ -304,8 +304,11 @@ int get_primary_dev(const char *sysfs_dir,
return ret;
}
if (stat(path, &info) < 0)
if (stat(path, &info) == -1) {
if (errno != ENOENT)
log_sys_error("stat", path);
return ret;
}
/*
* extract parent's path from the partition's symlink, e.g.:
@ -326,8 +329,11 @@ int get_primary_dev(const char *sysfs_dir,
}
/* finally, parse 'dev' attribute and create corresponding dev_t */
if (stat(path, &info) < 0) {
log_error("sysfs file %s does not exist", path);
if (stat(path, &info) == -1) {
if (errno == ENOENT)
log_error("sysfs file %s does not exist", path);
else
log_sys_error("stat", path);
return ret;
}
@ -386,7 +392,11 @@ static unsigned long _dev_topology_attribute(const char *attribute,
* - if not: either the kernel doesn't have topology support
* or the device could be a partition
*/
if (stat(path, &info) < 0) {
if (stat(path, &info) == -1) {
if (errno != ENOENT) {
log_sys_error("stat", path);
return 0;
}
if (!get_primary_dev(sysfs_dir, dev, &primary))
return 0;
@ -397,8 +407,11 @@ static unsigned long _dev_topology_attribute(const char *attribute,
log_error("primary dm_snprintf %s failed", attribute);
return 0;
}
if (stat(path, &info) < 0)
if (stat(path, &info) == -1) {
if (errno != ENOENT)
log_sys_error("stat", path);
return 0;
}
}
if (!(fp = fopen(path, "r"))) {