|
 |
b7f731 |
From 13e5d8455c22d4db420ead9fde3ee0c1536b73a3 Mon Sep 17 00:00:00 2001
|
|
|
b7f731 |
From: Jes Sorensen <jsorensen@fb.com>
|
|
|
b7f731 |
Date: Tue, 9 May 2017 16:38:06 -0400
|
|
|
b7f731 |
Subject: [RHEL7.5 PATCH 126/169] Monitor/check_array: Reduce duplicated
|
|
|
b7f731 |
error handling
|
|
|
b7f731 |
|
|
|
b7f731 |
Avoid closing fd in multiple places, and duplicating the error message
|
|
|
b7f731 |
for when a device disappeared.
|
|
|
b7f731 |
|
|
|
b7f731 |
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
|
b7f731 |
---
|
|
|
b7f731 |
Monitor.c | 39 +++++++++++++++------------------------
|
|
|
b7f731 |
1 file changed, 15 insertions(+), 24 deletions(-)
|
|
|
b7f731 |
|
|
|
b7f731 |
diff --git a/Monitor.c b/Monitor.c
|
|
|
b7f731 |
index f404009..c519877 100644
|
|
|
b7f731 |
--- a/Monitor.c
|
|
|
b7f731 |
+++ b/Monitor.c
|
|
|
b7f731 |
@@ -467,29 +467,16 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
|
|
|
b7f731 |
retval = 0;
|
|
|
b7f731 |
|
|
|
b7f731 |
fd = open(dev, O_RDONLY);
|
|
|
b7f731 |
- if (fd < 0) {
|
|
|
b7f731 |
- if (!st->err)
|
|
|
b7f731 |
- alert("DeviceDisappeared", dev, NULL, ainfo);
|
|
|
b7f731 |
- st->err++;
|
|
|
b7f731 |
- goto out;
|
|
|
b7f731 |
- }
|
|
|
b7f731 |
+ if (fd < 0)
|
|
|
b7f731 |
+ goto disappeared;
|
|
|
b7f731 |
|
|
|
b7f731 |
- if (!md_array_active(fd)) {
|
|
|
b7f731 |
- close(fd);
|
|
|
b7f731 |
- if (!st->err)
|
|
|
b7f731 |
- alert("DeviceDisappeared", dev, NULL, ainfo);
|
|
|
b7f731 |
- st->err++;
|
|
|
b7f731 |
- goto out;
|
|
|
b7f731 |
- }
|
|
|
b7f731 |
+ if (!md_array_active(fd))
|
|
|
b7f731 |
+ goto disappeared;
|
|
|
b7f731 |
|
|
|
b7f731 |
fcntl(fd, F_SETFD, FD_CLOEXEC);
|
|
|
b7f731 |
- if (md_get_array_info(fd, &array) < 0) {
|
|
|
b7f731 |
- if (!st->err)
|
|
|
b7f731 |
- alert("DeviceDisappeared", dev, NULL, ainfo);
|
|
|
b7f731 |
- st->err++;
|
|
|
b7f731 |
- close(fd);
|
|
|
b7f731 |
- goto out;
|
|
|
b7f731 |
- }
|
|
|
b7f731 |
+ if (md_get_array_info(fd, &array) < 0)
|
|
|
b7f731 |
+ goto disappeared;
|
|
|
b7f731 |
+
|
|
|
b7f731 |
/* It's much easier to list what array levels can't
|
|
|
b7f731 |
* have a device disappear than all of them that can
|
|
|
b7f731 |
*/
|
|
|
b7f731 |
@@ -497,7 +484,6 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
|
|
|
b7f731 |
if (!st->err && !st->from_config)
|
|
|
b7f731 |
alert("DeviceDisappeared", dev, " Wrong-Level", ainfo);
|
|
|
b7f731 |
st->err++;
|
|
|
b7f731 |
- close(fd);
|
|
|
b7f731 |
goto out;
|
|
|
b7f731 |
}
|
|
|
b7f731 |
if (st->devnm[0] == 0)
|
|
|
b7f731 |
@@ -534,7 +520,6 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
|
|
|
b7f731 |
st->working == array.working_disks &&
|
|
|
b7f731 |
st->spare == array.spare_disks &&
|
|
|
b7f731 |
(mse == NULL || (mse->percent == st->percent))) {
|
|
|
b7f731 |
- close(fd);
|
|
|
b7f731 |
if ((st->active < st->raid) && st->spare == 0)
|
|
|
b7f731 |
retval = 1;
|
|
|
b7f731 |
goto out;
|
|
|
b7f731 |
@@ -614,8 +599,6 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
|
|
|
b7f731 |
if (st->metadata == NULL && st->parent_devnm[0] == 0)
|
|
|
b7f731 |
st->metadata = super_by_fd(fd, NULL);
|
|
|
b7f731 |
|
|
|
b7f731 |
- close(fd);
|
|
|
b7f731 |
-
|
|
|
b7f731 |
for (i=0; i
|
|
|
b7f731 |
mdu_disk_info_t disc = {0,0,0,0,0};
|
|
|
b7f731 |
int newstate=0;
|
|
|
b7f731 |
@@ -661,7 +644,15 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
|
|
|
b7f731 |
retval = 1;
|
|
|
b7f731 |
|
|
|
b7f731 |
out:
|
|
|
b7f731 |
+ if (fd > 0)
|
|
|
b7f731 |
+ close(fd);
|
|
|
b7f731 |
return retval;
|
|
|
b7f731 |
+
|
|
|
b7f731 |
+ disappeared:
|
|
|
b7f731 |
+ if (!st->err)
|
|
|
b7f731 |
+ alert("DeviceDisappeared", dev, NULL, ainfo);
|
|
|
b7f731 |
+ st->err++;
|
|
|
b7f731 |
+ goto out;
|
|
|
b7f731 |
}
|
|
|
b7f731 |
|
|
|
b7f731 |
static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist,
|
|
|
b7f731 |
--
|
|
|
b7f731 |
2.7.4
|
|
|
b7f731 |
|