kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

zpcitctl: Exit on error in sysfs_report_error

Browse Source 
This also makes sure that we don't try to write to the
/sys/bus/pci/device/<dev>/recover attribute if reset failed.

Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
Reviewed-by: Jan Hoeppner <hoeppner@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Niklas Schnelle
2020-02-10 14:23:11 +01:00
committed by Jan Höppner
parent d77234ddb6
commit 304c3d8086
1 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
zpcictl/zpcictl.c
View File

@@ -97,6 +97,35 @@ static void fopen_err(char *path)
exit(EXIT_FAILURE);
}
static void fclose_err(char *path)
{
if (errno == EIO || errno == EOPNOTSUPP)
warnx("Unsupported operation: %s: %s", path, strerror(errno));
else
warnx("Could not close file: %s: %s", path, strerror(errno));
free(path);
exit(EXIT_FAILURE);
}
static void fread_err(FILE *fp, char *path)
{
warnx("Could not read file: %s: %s", path, strerror(errno));
if (fclose(fp))
fclose_err(path);
free(path);
exit(EXIT_FAILURE);
}
static void fwrite_err(FILE *fp, char *path)
{
warnx("Could not write to file: %s: %s", path, strerror(errno));
if (fclose(fp))
fclose_err(path);
free(path);
exit(EXIT_FAILURE);
}
#define READ_CHUNK_SIZE 512
static char *collect_smart_data(struct zpci_device *pdev)
@@ -152,12 +181,10 @@ static unsigned int sysfs_read_value(struct zpci_device *pdev, const char *attr)
if (!fp)
fopen_err(path);
if (fscanf(fp, "%x", &val) != 1) {
fclose(fp);
warnx("Could not read file %s: %s", path, strerror(errno));
free(path);
exit(EXIT_FAILURE);
fread_err(fp, path);
}
fclose(fp);
if (fclose(fp))
fclose_err(path);
free(path);
return val;
@@ -174,12 +201,10 @@ static void sysfs_write_value(struct zpci_device *pdev, const char *attr,
if (!fp)
fopen_err(path);
if (fprintf(fp, "%x", val) < 0) {
fclose(fp);
warnx("Could not write to file %s: %s", path, strerror(errno));
free(path);
exit(EXIT_FAILURE);
fwrite_err(fp, path);
}
fclose(fp);
if (fclose(fp))
fclose_err(path);
free(path);
}
@@ -196,13 +221,9 @@ static void sysfs_report_error(struct zpci_report_error *report, char *slot)
if (!fp)
fopen_err(path);
if (fwrite(report, 1, r_size, fp) != r_size)
warnx("Could not write to file: %s: %s", path, strerror(errno));
if (fclose(fp)) {
if (errno == EIO || errno == EOPNOTSUPP)
warnx("Unsupported operation: %s: %s", path, strerror(errno));
else
warnx("Could not close file: %s: %s", path, strerror(errno));
}
fwrite_err(fp, path);
if (fclose(fp))
fclose_err(path);
free(path);
}