diff options
author | Neil Brown <neilb@suse.de> | 2005-06-14 06:32:18 +0000 |
---|---|---|
committer | Neil Brown <neilb@suse.de> | 2005-06-14 06:32:18 +0000 |
commit | 91f068bf5cc423d7f7d3feba63e4c7add3a786de (patch) | |
tree | e6a730c4b25408514b2e3250ea83d02e6400250a /mdadm.c | |
parent | b8f72a621b55d23595e4743d7b697fed0e30583a (diff) | |
download | mdadm-91f068bf5cc423d7f7d3feba63e4c7add3a786de.tar.gz mdadm-91f068bf5cc423d7f7d3feba63e4c7add3a786de.tar.xz mdadm-91f068bf5cc423d7f7d3feba63e4c7add3a786de.zip |
Retry --stop --scan until all stoppable devices have been stopped
This is needed to reliably stop stacked arrays
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Diffstat (limited to 'mdadm.c')
-rw-r--r-- | mdadm.c | 59 |
1 files changed, 37 insertions, 22 deletions
@@ -809,7 +809,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); + rv = Manage_runstop(devlist->devname, mdfd, runstop, 0); break; case ASSEMBLE: if (devs_found == 1 && ident.uuid_set == 0 && @@ -939,20 +939,10 @@ int main(int argc, char *argv[]) rv = Examine(devlist, scan?!verbose:brief, scan, SparcAdjust, ss); } else { if (devlist == NULL) { - if ((devmode == 'S' ||devmode=='D') && scan) { - /* apply to all devices in /proc/mdstat */ + if (devmode=='D' && scan) { + /* apply --detail to all devices in /proc/mdstat */ struct mdstat_ent *ms = mdstat_read(0); struct mdstat_ent *e; - if (devmode == 'S') { - /* reverse order so that arrays made of arrays are stopped properly */ - struct mdstat_ent *sm = NULL; - while ((e=ms) != NULL) { - ms = e->next; - e->next = sm; - sm = e; - } - ms = sm; - } for (e=ms ; e ; e=e->next) { char *name = get_md_name(e->devnum); @@ -961,18 +951,43 @@ int main(int argc, char *argv[]) e->dev); continue; } - if (devmode == 'D') - rv |= Detail(name, !verbose, test); - else if (devmode=='S') { + rv |= Detail(name, !verbose, test); + put_md_name(name); + } + } else if (devmode == 'S' && scan) { + /* apply --stop to all devices in /proc/mdstat */ + /* Due to possible stacking of devices, repeat until + * nothing more can be stopped + */ + int progress=1, err; + int last = 0; + do { + struct mdstat_ent *ms = mdstat_read(0); + struct mdstat_ent *e; + + if (!progress) last = 1; + progress = 0; err = 0; + for (e=ms ; e ; e=e->next) { + char *name = get_md_name(e->devnum); + + if (!name) { + fprintf(stderr, Name ": cannot find device file for %s\n", + e->dev); + continue; + } mdfd = open_mddev(name, 0); if (mdfd >= 0) { - rv |= Manage_runstop(name, mdfd, -1); + if (Manage_runstop(name, mdfd, -1, !last)) + err = 1; + else + progress = 1; close(mdfd); } + + put_md_name(name); } - put_md_name(name); - } - } else { + } while (!last && err); + } else { fprintf(stderr, Name ": No devices given.\n"); exit(2); } @@ -992,9 +1007,9 @@ int main(int argc, char *argv[]) if (mdfd>=0) { switch(dv->disposition) { case 'R': - rv |= Manage_runstop(dv->devname, mdfd, 1); break; + rv |= Manage_runstop(dv->devname, mdfd, 1, 0); break; case 'S': - rv |= Manage_runstop(dv->devname, mdfd, -1); break; + rv |= Manage_runstop(dv->devname, mdfd, -1, 0); break; case 'o': rv |= Manage_ro(dv->devname, mdfd, 1); break; case 'w': |