X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=mdadm.c;h=2bd963a58c2fbf9e3158b88bc2cb5938971ddd8b;hp=45ffaee27508f004db19d6e247a5876f2992c73e;hb=9008ed1c9623b7c11775ea8a7be17eb1bde5fd09;hpb=7d19ad0de31cd0b94e69ac5f2efee98254f27316 diff --git a/mdadm.c b/mdadm.c index 45ffaee2..2bd963a5 100644 --- a/mdadm.c +++ b/mdadm.c @@ -26,7 +26,7 @@ * Sydney, 2052 * Australia * - * Additions for bitmap and write-behind RAID options, Copyright (C) 2003-2004, + * Additions for bitmap and write-behind RAID options, Copyright (C) 2003-2004, * Paul Clements, SteelEye Technology, Inc. */ @@ -124,6 +124,8 @@ int main(int argc, char *argv[]) ident.bitmap_fd = -1; ident.bitmap_file = NULL; ident.name[0] = 0; + ident.container = NULL; + ident.member = NULL; while ((option_index = -1) , (opt=getopt_long(argc, argv, @@ -133,7 +135,7 @@ int main(int argc, char *argv[]) /* firstly, some mode-independant options */ switch(opt) { case 'h': - if (option_index > 0 && + if (option_index > 0 && strcmp(long_options[option_index].name, "help-options")==0) print_help = 2; else @@ -174,7 +176,7 @@ int main(int argc, char *argv[]) } /* second, figure out the mode. * Some options force the mode. Others - * set the mode if it isn't already + * set the mode if it isn't already */ switch(opt) { @@ -199,7 +201,8 @@ int main(int argc, char *argv[]) case 'G': newmode = GROW; shortopt = short_bitmap_options; break; - case 'I': newmode = INCREMENTAL; break; + case 'I': newmode = INCREMENTAL; + shortopt = short_bitmap_auto_options; break; case AutoDetect: newmode = AUTODETECT; break; @@ -213,6 +216,7 @@ int main(int argc, char *argv[]) case 'o': case 'w': case 'W': + case Waitclean: case 'K': if (!mode) newmode = MISC; break; } if (mode && newmode == mode) { @@ -232,7 +236,7 @@ int main(int argc, char *argv[]) mode = newmode; } else { /* special case of -c --help */ - if (opt == 'c' && + if (opt == 'c' && ( strncmp(optarg, "--h", 3)==0 || strncmp(optarg, "-h", 2)==0)) { fputs(Help_config, stdout); @@ -252,10 +256,11 @@ int main(int argc, char *argv[]) dv->writemostly = writemostly; dv->re_add = re_add; dv->used = 0; + dv->content = NULL; dv->next = NULL; *devlistend = dv; devlistend = &dv->next; - + devs_found++; continue; } @@ -304,10 +309,12 @@ int main(int argc, char *argv[]) dv->disposition = devmode; dv->writemostly = writemostly; dv->re_add = re_add; + dv->used = 0; + dv->content = NULL; dv->next = NULL; *devlistend = dv; devlistend = &dv->next; - + devs_found++; continue; } @@ -342,7 +349,7 @@ int main(int argc, char *argv[]) fprintf(stderr, Name ": metadata information already given\n"); exit(2); } - for(i=0; !ss && superlist[i]; i++) + for(i=0; !ss && superlist[i]; i++) ss = superlist[i]->match_metadata_desc(optarg); if (!ss) { @@ -359,6 +366,12 @@ int main(int argc, char *argv[]) writemostly = 1; continue; + case O(MANAGE,'w'): + /* clear write-mostly for following devices */ + writemostly = 2; + continue; + + case O(GROW,'z'): case O(CREATE,'z'): /* size */ if (size >= 0) { @@ -451,7 +464,7 @@ int main(int argc, char *argv[]) case -5: /* Faulty * modeNNN */ - + { int ln = strcspn(optarg, "0123456789"); char *m = strdup(optarg); @@ -511,6 +524,7 @@ int main(int argc, char *argv[]) case O(CREATE,'a'): case O(BUILD,'a'): + case O(INCREMENTAL,'a'): case O(ASSEMBLE,'a'): /* auto-creation of device node */ autof = parse_auto(optarg, "--auto flag", 0); continue; @@ -584,7 +598,7 @@ int main(int argc, char *argv[]) exit(2); } update = optarg; - if (strcmp(update, "sparc2.2")==0) + if (strcmp(update, "sparc2.2")==0) continue; if (strcmp(update, "super-minor") == 0) continue; @@ -605,7 +619,7 @@ int main(int argc, char *argv[]) fprintf(stderr, Name ": must not set metadata type with --update=byteorder.\n"); exit(2); } - for(i=0; !ss && superlist[i]; i++) + for(i=0; !ss && superlist[i]; i++) ss = superlist[i]->match_metadata_desc("0.swap"); if (!ss) { fprintf(stderr, Name ": INTERNAL ERROR cannot find 0.swap\n"); @@ -635,6 +649,7 @@ int main(int argc, char *argv[]) continue; case O(ASSEMBLE,'c'): /* config file */ + case O(INCREMENTAL, 'c'): case O(MISC, 'c'): case O(MONITOR,'c'): if (configfile) { @@ -702,7 +717,7 @@ int main(int argc, char *argv[]) test = 1; continue; case O(MONITOR,'y'): /* log messages to syslog */ - openlog("mdadm", 0, SYSLOG_FACILITY); + openlog("mdadm", LOG_PID, SYSLOG_FACILITY); dosyslog = 1; continue; @@ -743,21 +758,6 @@ int main(int argc, char *argv[]) runstop = -1; continue; - case O(MANAGE,'o'): - if (readonly < 0) { - fprintf(stderr, Name ": Cannot have both readonly and readwrite\n"); - exit(2); - } - readonly = 1; - continue; - case O(MANAGE,'w'): - if (readonly > 0) { - fprintf(stderr, Name ": Cannot have both readwrite and readonly.\n"); - exit(2); - } - readonly = -1; - continue; - case O(MISC,'Q'): case O(MISC,'D'): case O(MISC,'E'): @@ -768,6 +768,7 @@ int main(int argc, char *argv[]) case O(MISC,'o'): case O(MISC,'w'): case O(MISC,'W'): + case O(MISC, Waitclean): if (devmode && devmode != opt && (devmode == 'E' || (opt == 'E' && devmode != 'Q'))) { fprintf(stderr, Name ": --examine/-E cannot be given with -%c\n", @@ -817,9 +818,15 @@ int main(int argc, char *argv[]) backup_file = optarg; continue; - case O(GROW,'b'): case O(BUILD,'b'): case O(CREATE,'b'): /* here we create the bitmap */ + if (strcmp(optarg, "none") == 0) { + fprintf(stderr, Name ": '--bitmap none' only" + " support for --grow\n"); + exit(2); + } + /* FALL THROUGH */ + case O(GROW,'b'): if (strcmp(optarg, "internal")== 0 || strcmp(optarg, "none")== 0 || strchr(optarg, '/') != NULL) { @@ -935,19 +942,39 @@ int main(int argc, char *argv[]) exit(2); } if ((int)ident.super_minor == -2 && autof) { - fprintf(stderr, Name ": --super-minor=dev is incompatible with --auto\n"); + fprintf(stderr, Name ": --super-minor=dev is incompatible with --auto\n"); exit(2); } - if (mode == MANAGE || mode == GROW) - autof=1; /* Don't create */ - mdfd = open_mddev(devlist->devname, autof); - if (mdfd < 0) + if (mode == MANAGE || mode == GROW) { + mdfd = open_mddev(devlist->devname, 1); + if (mdfd < 0) + exit(1); + } else + /* non-existent device is OK */ + mdfd = open_mddev(devlist->devname, 0); + if (mdfd == -2) { + fprintf(stderr, Name ": device %s exists but is not an " + "md array.\n", devlist->devname); exit(1); + } if ((int)ident.super_minor == -2) { struct stat stb; + if (mdfd < 0) { + fprintf(stderr, Name ": --super-minor=dev given, and " + "listed device %s doesn't exist.\n", + devlist->devname); + exit(1); + } fstat(mdfd, &stb); ident.super_minor = minor(stb.st_rdev); } + if (mdfd >= 0 && mode != MANAGE && mode != GROW) { + /* We don't really want this open yet, we just might + * have wanted to check some things + */ + close(mdfd); + mdfd = -1; + } } if (raiddisks) { @@ -973,13 +1000,15 @@ int main(int argc, char *argv[]) if (homehost == NULL) homehost = conf_get_homehost(); - if (homehost && strcmp(homehost, "")==0) { + if (homehost == NULL || strcmp(homehost, "")==0) { if (gethostname(sys_hostname, sizeof(sys_hostname)) == 0) { sys_hostname[sizeof(sys_hostname)-1] = 0; homehost = sys_hostname; } } + ident.autof = autof; + rv = 0; switch(mode) { case MANAGE: @@ -1003,20 +1032,17 @@ int main(int argc, char *argv[]) fprintf(stderr, Name ": %s not identified in config file.\n", devlist->devname); rv |= 1; - } else { - mdfd = open_mddev(devlist->devname, - array_ident->autof ? array_ident->autof : autof); - if (mdfd < 0) - rv |= 1; - else { - rv |= Assemble(ss, devlist->devname, mdfd, array_ident, - NULL, backup_file, - readonly, runstop, update, homehost, verbose-quiet, force); + if (mdfd >= 0) close(mdfd); - } + } else { + if (array_ident->autof == 0) + array_ident->autof = autof; + rv |= Assemble(ss, devlist->devname, array_ident, + NULL, backup_file, + readonly, runstop, update, homehost, verbose-quiet, force); } } else if (!scan) - rv = Assemble(ss, devlist->devname, mdfd, &ident, + rv = Assemble(ss, devlist->devname, &ident, devlist->next, backup_file, readonly, runstop, update, homehost, verbose-quiet, force); else if (devs_found>0) { @@ -1036,16 +1062,11 @@ int main(int argc, char *argv[]) rv |= 1; continue; } - mdfd = open_mddev(dv->devname, - array_ident->autof ?array_ident->autof : autof); - if (mdfd < 0) { - rv |= 1; - continue; - } - rv |= Assemble(ss, dv->devname, mdfd, array_ident, + if (array_ident->autof == 0) + array_ident->autof = autof; + rv |= Assemble(ss, dv->devname, array_ident, NULL, backup_file, readonly, runstop, update, homehost, verbose-quiet, force); - close(mdfd); } } else { mddev_ident_t array_list = conf_get_ident(NULL); @@ -1064,39 +1085,30 @@ int main(int argc, char *argv[]) exit(1); } for (; array_list; array_list = array_list->next) { - mdu_array_info_t array; - mdfd = open_mddev(array_list->devname, - array_list->autof ? array_list->autof : autof); - if (mdfd < 0) { - rv |= 1; - continue; - } - if (ioctl(mdfd, GET_ARRAY_INFO, &array)>=0) - /* already assembled, skip */ - cnt++; - else { - rv |= Assemble(ss, array_list->devname, mdfd, - array_list, - NULL, NULL, - readonly, runstop, NULL, homehost, verbose-quiet, force); - if (rv == 0) cnt++; - } - close(mdfd); + if (array_list->autof == 0) + array_list->autof = autof; + + rv |= Assemble(ss, array_list->devname, + array_list, + NULL, NULL, + readonly, runstop, NULL, homehost, verbose-quiet, force); + if (rv == 0) cnt++; } if (homehost) { /* Maybe we can auto-assemble something. - * Repeatedly call Assemble in auto-assmble mode + * Repeatedly call Assemble in auto-assemble mode * until it fails */ int rv2; int acnt; ident.autof = autof; do { + mddev_dev_t devlist = conf_get_devs(); acnt = 0; do { - rv2 = Assemble(ss, NULL, -1, + rv2 = Assemble(ss, NULL, &ident, - NULL, NULL, + devlist, NULL, readonly, runstop, NULL, homehost, verbose-quiet, force); if (rv2==0) { cnt++; @@ -1115,7 +1127,7 @@ int main(int argc, char *argv[]) do { acnt = 0; do { - rv2 = Assemble(ss, NULL, -1, + rv2 = Assemble(ss, NULL, &ident, NULL, NULL, readonly, runstop, "homehost", homehost, verbose-quiet, force); @@ -1130,7 +1142,8 @@ int main(int argc, char *argv[]) if (cnt == 0 && rv == 0) { fprintf(stderr, Name ": No arrays found in config file or automatically\n"); rv = 1; - } + } else if (cnt) + rv = 0; } else if (cnt == 0 && rv == 0) { fprintf(stderr, Name ": No arrays found in config file\n"); rv = 1; @@ -1145,7 +1158,7 @@ int main(int argc, char *argv[]) break; } if (raiddisks == 0) { - fprintf(stderr, Name ": no raid-disks specified.\n"); + fprintf(stderr, Name ": no raid-devices specified.\n"); rv = 1; break; } @@ -1157,9 +1170,10 @@ int main(int argc, char *argv[]) break; } } - rv = Build(devlist->devname, mdfd, chunk, level, layout, + rv = Build(devlist->devname, chunk, level, layout, raiddisks, devlist->next, assume_clean, - bitmap_file, bitmap_chunk, write_behind, delay, verbose-quiet); + bitmap_file, bitmap_chunk, write_behind, + delay, verbose-quiet, autof); break; case CREATE: if (delay == 0) delay = DEFAULT_BITMAP_DELAY; @@ -1169,16 +1183,16 @@ int main(int argc, char *argv[]) break; } if (raiddisks == 0) { - fprintf(stderr, Name ": no raid-disks specified.\n"); + fprintf(stderr, Name ": no raid-devices specified.\n"); rv = 1; break; } - rv = Create(ss, devlist->devname, mdfd, chunk, level, layout, size<0 ? 0 : size, + rv = Create(ss, devlist->devname, chunk, level, layout, size<0 ? 0 : size, raiddisks, sparedisks, ident.name, homehost, ident.uuid_set ? ident.uuid : NULL, devs_found-1, devlist->next, runstop, verbose-quiet, force, assume_clean, - bitmap_file, bitmap_chunk, write_behind, delay); + bitmap_file, bitmap_chunk, write_behind, delay, autof); break; case MISC: if (devmode == 'E') { @@ -1194,7 +1208,9 @@ int main(int argc, char *argv[]) } if (brief && verbose) brief = 2; - rv = Examine(devlist, scan?(verbose>1?0:verbose+1):brief, scan, SparcAdjust, ss, homehost); + rv = Examine(devlist, scan?(verbose>1?0:verbose+1):brief, + export, scan, + SparcAdjust, ss, homehost); } else { if (devlist == NULL) { if (devmode=='D' && scan) { @@ -1260,13 +1276,16 @@ int main(int argc, char *argv[]) export, test, homehost); continue; case 'K': /* Zero superblock */ - rv |= Kill(dv->devname, force, quiet); continue; + rv |= Kill(dv->devname, force, quiet,0); + continue; case 'Q': rv |= Query(dv->devname); continue; case 'X': rv |= ExamineBitmap(dv->devname, brief, ss); continue; case 'W': rv |= Wait(dv->devname); continue; + case Waitclean: + rv |= WaitClean(dv->devname, verbose-quiet); continue; } mdfd = open_mddev(dv->devname, 1); if (mdfd>=0) { @@ -1304,7 +1323,7 @@ int main(int argc, char *argv[]) case GROW: if (devs_found > 1) { - + /* must be '-a'. */ if (size >= 0 || raiddisks) { fprintf(stderr, Name ": --size, --raiddisks, and --add are exclusing in --grow mode\n");