From ab56093f3b0fd59c49a5cdef22c0480e589f0989 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Fri, 2 Jun 2006 05:53:22 +0000 Subject: [PATCH] Get --stop to honour --quiet And as a side effect, if --quiet isn't given, stopped devices are reported. Signed-off-by: Neil Brown --- Manage.c | 4 +++- mdadm.c | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Manage.c b/Manage.c index 660580b9..a1e152c8 100644 --- a/Manage.c +++ b/Manage.c @@ -106,11 +106,13 @@ int Manage_runstop(char *devname, int fd, int runstop, int quiet) } } else if (runstop < 0){ if (ioctl(fd, STOP_ARRAY, NULL)) { - if (!quiet) + if (quiet==0) fprintf(stderr, Name ": fail to stop array %s: %s\n", devname, strerror(errno)); return 1; } + if (quiet <= 0) + fprintf(stderr, Name ": stopped %s\n", devname); } return 0; } diff --git a/mdadm.c b/mdadm.c index 2583ee29..c5035b86 100644 --- a/mdadm.c +++ b/mdadm.c @@ -931,7 +931,7 @@ int main(int argc, char *argv[]) if (!rv && readonly < 0) rv = Manage_ro(devlist->devname, mdfd, readonly); if (!rv && runstop) - rv = Manage_runstop(devlist->devname, mdfd, runstop, 0); + rv = Manage_runstop(devlist->devname, mdfd, runstop, quiet); break; case ASSEMBLE: if (devs_found == 1 && ident.uuid_set == 0 && @@ -1164,7 +1164,7 @@ int main(int argc, char *argv[]) } mdfd = open_mddev(name, 1); if (mdfd >= 0) { - if (Manage_runstop(name, mdfd, -1, !last)) + if (Manage_runstop(name, mdfd, -1, quiet?1:last?0:-1)) err = 1; else progress = 1; @@ -1195,9 +1195,9 @@ int main(int argc, char *argv[]) if (mdfd>=0) { switch(dv->disposition) { case 'R': - rv |= Manage_runstop(dv->devname, mdfd, 1, 0); break; + rv |= Manage_runstop(dv->devname, mdfd, 1, quiet); break; case 'S': - rv |= Manage_runstop(dv->devname, mdfd, -1, 0); break; + rv |= Manage_runstop(dv->devname, mdfd, -1, quiet); break; case 'o': rv |= Manage_ro(dv->devname, mdfd, 1); break; case 'w': -- 2.39.2