|
 |
2c1b57 |
From 9f3dd4549b2b904d343b79a8a7ba40c547e71d5d Mon Sep 17 00:00:00 2001
|
|
|
2c1b57 |
From: Jes Sorensen <jsorensen@fb.com>
|
|
|
2c1b57 |
Date: Thu, 11 May 2017 16:40:16 -0400
|
|
|
2c1b57 |
Subject: [RHEL7.5 PATCH 137/169] Monitor: Not much point declaring mdlist
|
|
|
2c1b57 |
in both forks of the if() statement
|
|
|
2c1b57 |
|
|
|
2c1b57 |
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
|
2c1b57 |
---
|
|
|
2c1b57 |
Monitor.c | 5 +++--
|
|
|
2c1b57 |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
2c1b57 |
|
|
|
2c1b57 |
diff --git a/Monitor.c b/Monitor.c
|
|
|
2c1b57 |
index 5b95847..a4afe75 100644
|
|
|
2c1b57 |
--- a/Monitor.c
|
|
|
2c1b57 |
+++ b/Monitor.c
|
|
|
2c1b57 |
@@ -127,6 +127,7 @@ int Monitor(struct mddev_dev *devlist,
|
|
|
2c1b57 |
struct mdstat_ent *mdstat = NULL;
|
|
|
2c1b57 |
char *mailfrom = NULL;
|
|
|
2c1b57 |
struct alert_info info;
|
|
|
2c1b57 |
+ struct mddev_ident *mdlist;
|
|
|
2c1b57 |
|
|
|
2c1b57 |
if (!mailaddr) {
|
|
|
2c1b57 |
mailaddr = conf_get_mailaddr();
|
|
|
2c1b57 |
@@ -162,7 +163,7 @@ int Monitor(struct mddev_dev *devlist,
|
|
|
2c1b57 |
return 1;
|
|
|
2c1b57 |
|
|
|
2c1b57 |
if (devlist == NULL) {
|
|
|
2c1b57 |
- struct mddev_ident *mdlist = conf_get_ident(NULL);
|
|
|
2c1b57 |
+ mdlist = conf_get_ident(NULL);
|
|
|
2c1b57 |
for (; mdlist; mdlist=mdlist->next) {
|
|
|
2c1b57 |
struct state *st;
|
|
|
2c1b57 |
if (mdlist->devname == NULL)
|
|
|
2c1b57 |
@@ -189,8 +190,8 @@ int Monitor(struct mddev_dev *devlist,
|
|
|
2c1b57 |
} else {
|
|
|
2c1b57 |
struct mddev_dev *dv;
|
|
|
2c1b57 |
for (dv=devlist ; dv; dv=dv->next) {
|
|
|
2c1b57 |
- struct mddev_ident *mdlist = conf_get_ident(dv->devname);
|
|
|
2c1b57 |
struct state *st = xcalloc(1, sizeof *st);
|
|
|
2c1b57 |
+ mdlist = conf_get_ident(dv->devname);
|
|
|
2c1b57 |
st->devname = xstrdup(dv->devname);
|
|
|
2c1b57 |
st->next = statelist;
|
|
|
2c1b57 |
st->devnm[0] = 0;
|
|
|
2c1b57 |
--
|
|
|
2c1b57 |
2.7.4
|
|
|
2c1b57 |
|