|
 |
b7f731 |
From 1830e74b4cbde28279f341bc80b68e9d82df32c6 Mon Sep 17 00:00:00 2001
|
|
|
b7f731 |
From: Jes Sorensen <jsorensen@fb.com>
|
|
|
b7f731 |
Date: Tue, 9 May 2017 16:25:23 -0400
|
|
|
b7f731 |
Subject: [RHEL7.5 PATCH 125/169] Monitor/check_array: Centralize exit path
|
|
|
b7f731 |
|
|
|
b7f731 |
Improve exit handling to make it easier to share error handling and free
|
|
|
b7f731 |
sysfs entries later.
|
|
|
b7f731 |
|
|
|
b7f731 |
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
|
b7f731 |
---
|
|
|
b7f731 |
Monitor.c | 24 ++++++++++++++----------
|
|
|
b7f731 |
1 file changed, 14 insertions(+), 10 deletions(-)
|
|
|
b7f731 |
|
|
|
b7f731 |
diff --git a/Monitor.c b/Monitor.c
|
|
|
b7f731 |
index c96f8e8..f404009 100644
|
|
|
b7f731 |
--- a/Monitor.c
|
|
|
b7f731 |
+++ b/Monitor.c
|
|
|
b7f731 |
@@ -459,16 +459,19 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
|
|
|
b7f731 |
int remaining_disks;
|
|
|
b7f731 |
int last_disk;
|
|
|
b7f731 |
int new_array = 0;
|
|
|
b7f731 |
+ int retval;
|
|
|
b7f731 |
|
|
|
b7f731 |
if (test)
|
|
|
b7f731 |
alert("TestMessage", dev, NULL, ainfo);
|
|
|
b7f731 |
|
|
|
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 |
- return 0;
|
|
|
b7f731 |
+ goto out;
|
|
|
b7f731 |
}
|
|
|
b7f731 |
|
|
|
b7f731 |
if (!md_array_active(fd)) {
|
|
|
b7f731 |
@@ -476,7 +479,7 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
|
|
|
b7f731 |
if (!st->err)
|
|
|
b7f731 |
alert("DeviceDisappeared", dev, NULL, ainfo);
|
|
|
b7f731 |
st->err++;
|
|
|
b7f731 |
- return 0;
|
|
|
b7f731 |
+ goto out;
|
|
|
b7f731 |
}
|
|
|
b7f731 |
|
|
|
b7f731 |
fcntl(fd, F_SETFD, FD_CLOEXEC);
|
|
|
b7f731 |
@@ -485,7 +488,7 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
|
|
|
b7f731 |
alert("DeviceDisappeared", dev, NULL, ainfo);
|
|
|
b7f731 |
st->err++;
|
|
|
b7f731 |
close(fd);
|
|
|
b7f731 |
- return 0;
|
|
|
b7f731 |
+ goto out;
|
|
|
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 |
@@ -495,7 +498,7 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
|
|
|
b7f731 |
alert("DeviceDisappeared", dev, " Wrong-Level", ainfo);
|
|
|
b7f731 |
st->err++;
|
|
|
b7f731 |
close(fd);
|
|
|
b7f731 |
- return 0;
|
|
|
b7f731 |
+ goto out;
|
|
|
b7f731 |
}
|
|
|
b7f731 |
if (st->devnm[0] == 0)
|
|
|
b7f731 |
strcpy(st->devnm, fd2devnm(fd));
|
|
|
b7f731 |
@@ -511,7 +514,7 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
|
|
|
b7f731 |
* or re-created after reading mdstat*/
|
|
|
b7f731 |
st->err++;
|
|
|
b7f731 |
close(fd);
|
|
|
b7f731 |
- return 0;
|
|
|
b7f731 |
+ goto out;
|
|
|
b7f731 |
}
|
|
|
b7f731 |
/* this array is in /proc/mdstat */
|
|
|
b7f731 |
if (array.utime == 0)
|
|
|
b7f731 |
@@ -533,9 +536,8 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
|
|
|
b7f731 |
(mse == NULL || (mse->percent == st->percent))) {
|
|
|
b7f731 |
close(fd);
|
|
|
b7f731 |
if ((st->active < st->raid) && st->spare == 0)
|
|
|
b7f731 |
- return 1;
|
|
|
b7f731 |
- else
|
|
|
b7f731 |
- return 0;
|
|
|
b7f731 |
+ retval = 1;
|
|
|
b7f731 |
+ goto out;
|
|
|
b7f731 |
}
|
|
|
b7f731 |
if (st->utime == 0 && /* new array */
|
|
|
b7f731 |
mse->pattern && strchr(mse->pattern, '_') /* degraded */)
|
|
|
b7f731 |
@@ -656,8 +658,10 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
|
|
|
b7f731 |
st->raid = array.raid_disks;
|
|
|
b7f731 |
st->err = 0;
|
|
|
b7f731 |
if ((st->active < st->raid) && st->spare == 0)
|
|
|
b7f731 |
- return 1;
|
|
|
b7f731 |
- return 0;
|
|
|
b7f731 |
+ retval = 1;
|
|
|
b7f731 |
+
|
|
|
b7f731 |
+ out:
|
|
|
b7f731 |
+ return retval;
|
|
|
b7f731 |
}
|
|
|
b7f731 |
|
|
|
b7f731 |
static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist,
|
|
|
b7f731 |
--
|
|
|
b7f731 |
2.7.4
|
|
|
b7f731 |
|