Clarify when update=super-minor happens automatcially

[thirdparty/mdadm.git] / Monitor.c

diff --git a/Monitor.c b/Monitor.c
index 7314cdcd2b780366b1f66cd7eff1ffbb435407ac..315fee2548cb03a8b3459b49428dcad7d24bdeed 100644 (file)
--- a/Monitor.c
+++ b/Monitor.c
@@ -54,7 +54,7 @@ static char *percentalerts[] = {
 int Monitor(mddev_dev_t devlist,
            char *mailaddr, char *alert_cmd,
            int period, int daemonise, int scan, int oneshot,
-           int dosyslog, char *config, int test, char* pidfile)
+           int dosyslog, int test, char* pidfile)
 {
        /*
         * Every few seconds, scan every md device looking for changes
@@ -116,15 +116,15 @@ int Monitor(mddev_dev_t devlist,
        char *mailfrom = NULL;
 
        if (!mailaddr) {
-               mailaddr = conf_get_mailaddr(config);
+               mailaddr = conf_get_mailaddr();
                if (mailaddr && ! scan)
                        fprintf(stderr, Name ": Monitor using email address \"%s\" from config file\n",
                               mailaddr);
        }
-       mailfrom = conf_get_mailfrom(config);
+       mailfrom = conf_get_mailfrom();
 
        if (!alert_cmd) {
-               alert_cmd = conf_get_program(config);
+               alert_cmd = conf_get_program();
                if (alert_cmd && ! scan)
                        fprintf(stderr, Name ": Monitor using program \"%s\" from config file\n",
                               alert_cmd);
@@ -163,7 +163,7 @@ int Monitor(mddev_dev_t devlist,
        }
 
        if (devlist == NULL) {
-               mddev_ident_t mdlist = conf_get_ident(config, NULL);
+               mddev_ident_t mdlist = conf_get_ident(NULL);
                for (; mdlist; mdlist=mdlist->next) {
                        struct state *st = malloc(sizeof *st);
                        if (st == NULL)
@@ -184,7 +184,7 @@ int Monitor(mddev_dev_t devlist,
        } else {
                mddev_dev_t dv;
                for (dv=devlist ; dv; dv=dv->next) {
-                       mddev_ident_t mdlist = conf_get_ident(config, dv->devname);
+                       mddev_ident_t mdlist = conf_get_ident(dv->devname);
                        struct state *st = malloc(sizeof *st);
                        if (st == NULL)
                                continue;
@@ -383,9 +383,9 @@ int Monitor(mddev_dev_t devlist,
                                            ioctl(fd, GET_ARRAY_INFO, &array)< 0) {
                                                /* no such array */
                                                if (fd >=0) close(fd);
+                                               put_md_name(st->devname);
                                                free(st->devname);
                                                free(st);
-                                               put_md_name(st->devname);
                                                continue;
                                        }
                                        close(fd);
@@ -519,9 +519,9 @@ static void alert(char *event, char *dev, char *disc, char *mailaddr, char *mail
                        if (mdstat) {
                                char buf[8192];
                                int n;
-                               fprintf(mp, "\nP.S. The /proc/mdstat file current contains the following:\n\n");
+                               fprintf(mp, "\nP.S. The /proc/mdstat file currently contains the following:\n\n");
                                while ( (n=fread(buf, 1, sizeof(buf), mdstat)) > 0)
-                                       fwrite(buf, 1, n, mp);
+                                       n=fwrite(buf, 1, n, mp); /* yes, i don't care about the result */
                                fclose(mdstat);
                        }
                        fclose(mp);