X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=Incremental.c;h=f88b30ed796ebdcb5437d77981cd328e36964e8a;hp=833eac7ee05c65bb099af5324c7d521648652f9b;hb=ca3b66960301eb5d87e9b2ee99d3728c877ed111;hpb=c8e1a230b73c44aff5beeeb74d32e36219bed12d diff --git a/Incremental.c b/Incremental.c index 833eac7e..f88b30ed 100644 --- a/Incremental.c +++ b/Incremental.c @@ -2,7 +2,7 @@ * Incremental.c - support --incremental. Part of: * mdadm - manage Linux "md" devices aka RAID arrays. * - * Copyright (C) 2006-2009 Neil Brown + * Copyright (C) 2006-2012 Neil Brown * * * This program is free software; you can redistribute it and/or modify @@ -43,13 +43,10 @@ static int try_spare(char *devname, int *dfdp, struct dev_policy *pol, struct supertype *st, int verbose); static int Incremental_container(struct supertype *st, char *devname, - char *homehost, - int verbose, int runstop, int autof, - int freeze_reshape); + struct context *c); -int Incremental(char *devname, int verbose, int runstop, - struct supertype *st, char *homehost, int require_homehost, - int autof, int freeze_reshape) +int Incremental(char *devname, struct context *c, + struct supertype *st) { /* Add this device to an array, creating the array if necessary * and starting the array if sensible or - if runstop>0 - if possible. @@ -108,20 +105,20 @@ int Incremental(char *devname, int verbose, int runstop, struct createinfo *ci = conf_get_create_info(); if (stat(devname, &stb) < 0) { - if (verbose >= 0) + if (c->verbose >= 0) pr_err("stat failed for %s: %s.\n", devname, strerror(errno)); return rv; } if ((stb.st_mode & S_IFMT) != S_IFBLK) { - if (verbose >= 0) + if (c->verbose >= 0) pr_err("%s is not a block device.\n", devname); return rv; } dfd = dev_open(devname, O_RDONLY|O_EXCL); if (dfd < 0) { - if (verbose >= 0) + if (c->verbose >= 0) pr_err("cannot open %s: %s.\n", devname, strerror(errno)); return rv; @@ -138,9 +135,7 @@ int Incremental(char *devname, int verbose, int runstop, if (map_lock(&map)) pr_err("failed to get " "exclusive lock on mapfile\n"); - rv = Incremental_container(st, devname, homehost, - verbose, runstop, autof, - freeze_reshape); + rv = Incremental_container(st, devname, c); map_unlock(&map); return rv; } @@ -153,7 +148,7 @@ int Incremental(char *devname, int verbose, int runstop, /* 1/ Check if device is permitted by mdadm.conf */ if (!conf_test_dev(devname)) { - if (verbose >= 0) + if (c->verbose >= 0) pr_err("%s not permitted by mdadm.conf.\n", devname); goto out; @@ -163,13 +158,13 @@ int Incremental(char *devname, int verbose, int runstop, * version/name from args) */ if (fstat(dfd, &stb) < 0) { - if (verbose >= 0) + if (c->verbose >= 0) pr_err("fstat failed for %s: %s.\n", devname, strerror(errno)); goto out; } if ((stb.st_mode & S_IFMT) != S_IFBLK) { - if (verbose >= 0) + if (c->verbose >= 0) pr_err("%s is not a block device.\n", devname); goto out; @@ -182,22 +177,22 @@ int Incremental(char *devname, int verbose, int runstop, have_target = policy_check_path(&dinfo, &target_array); if (st == NULL && (st = guess_super(dfd)) == NULL) { - if (verbose >= 0) + if (c->verbose >= 0) pr_err("no recognisable superblock on %s.\n", devname); rv = try_spare(devname, &dfd, policy, have_target ? &target_array : NULL, - st, verbose); + st, c->verbose); goto out; } if (st->ss->compare_super == NULL || st->ss->load_super(st, dfd, NULL)) { - if (verbose >= 0) + if (c->verbose >= 0) pr_err("no RAID superblock on %s.\n", devname); rv = try_spare(devname, &dfd, policy, have_target ? &target_array : NULL, - st, verbose); + st, c->verbose); free(st); goto out; } @@ -206,13 +201,13 @@ int Incremental(char *devname, int verbose, int runstop, st->ss->getinfo_super(st, &info, NULL); /* 3/ Check if there is a match in mdadm.conf */ - match = conf_match(st, &info, devname, verbose, &rv); + match = conf_match(st, &info, devname, c->verbose, &rv); if (!match && rv == 2) goto out; if (match && match->devname && strcasecmp(match->devname, "") == 0) { - if (verbose >= 0) + if (c->verbose >= 0) pr_err("array containing %s is explicitly" " ignored by mdadm.conf\n", devname); @@ -225,17 +220,16 @@ int Incremental(char *devname, int verbose, int runstop, * on that. */ if (match) trustworthy = LOCAL; - else if (st->ss->match_home(st, homehost) == 1) + else if (st->ss->match_home(st, c->homehost) == 1) trustworthy = LOCAL; else if (st->ss->match_home(st, "any") == 1) trustworthy = LOCAL_ANY; else trustworthy = FOREIGN; - if (!match && !conf_test_metadata(st->ss->name, policy, (trustworthy == LOCAL))) { - if (verbose >= 1) + if (c->verbose >= 1) pr_err("%s has metadata type %s for which " "auto-assembly is disabled\n", devname, st->ss->name); @@ -250,9 +244,9 @@ int Incremental(char *devname, int verbose, int runstop, * CREATE. */ if (match && match->autof) - autof = match->autof; - if (autof == 0) - autof = ci->autof; + c->autof = match->autof; + if (c->autof == 0) + c->autof = ci->autof; name_to_use = info.name; if (name_to_use[0] == 0 && @@ -261,7 +255,7 @@ int Incremental(char *devname, int verbose, int runstop, trustworthy = METADATA; } if (name_to_use[0] && trustworthy != LOCAL && - ! require_homehost && + ! c->require_homehost && conf_name_is_free(name_to_use)) trustworthy = LOCAL; @@ -286,7 +280,7 @@ int Incremental(char *devname, int verbose, int runstop, /* Couldn't find an existing array, maybe make a new one */ mdfd = create_mddev(match ? match->devname : NULL, - name_to_use, autof, trustworthy, chosen_name); + name_to_use, c->autof, trustworthy, chosen_name); if (mdfd < 0) goto out_unlock; @@ -312,7 +306,7 @@ int Incremental(char *devname, int verbose, int runstop, } sra = sysfs_read(mdfd, -1, (GET_DEVS | GET_STATE | GET_OFFSET | GET_SIZE)); - + if (!sra || !sra->devs || sra->devs->disk.raid_disk >= 0) { /* It really should be 'none' - must be old buggy * kernel, and mdadm -I may not be able to complete. @@ -342,7 +336,7 @@ int Incremental(char *devname, int verbose, int runstop, sra = sysfs_read(mdfd, -1, (GET_DEVS | GET_STATE | GET_OFFSET | GET_SIZE)); - + if (mp->path) strcpy(chosen_name, mp->path); else @@ -363,7 +357,7 @@ int Incremental(char *devname, int verbose, int runstop, && (info.disk.state & (1<ss->name, act_re_add) - && runstop < 1) { + && c->runstop < 1) { if (ioctl(mdfd, GET_ARRAY_INFO, &ainf) == 0) { pr_err("not adding %s to active array (without --run) %s\n", devname, chosen_name); @@ -417,7 +411,7 @@ int Incremental(char *devname, int verbose, int runstop, * disk.number. Find and reject any such */ find_reject(mdfd, st, sra, info.disk.number, - info.events, verbose, chosen_name); + info.events, c->verbose, chosen_name); err = add_disk(mdfd, st, sra, &info); } if (err < 0) { @@ -429,7 +423,7 @@ int Incremental(char *devname, int verbose, int runstop, info.array.working_disks = 0; for (d = sra->devs; d; d=d->next) info.array.working_disks ++; - + } /* 7/ Is there enough devices to possibly start the array? */ @@ -438,10 +432,10 @@ int Incremental(char *devname, int verbose, int runstop, int devnum = devnum; /* defined and used iff ->external */ /* Try to assemble within the container */ sysfs_uevent(sra, "change"); - if (verbose >= 0) + if (c->verbose >= 0) pr_err("container %s now has %d device%s\n", chosen_name, info.array.working_disks, - info.array.working_disks==1?"":"s"); + info.array.working_disks == 1?"":"s"); wait_for(chosen_name, mdfd); if (st->ss->external) devnum = fd2devnum(mdfd); @@ -450,9 +444,7 @@ int Incremental(char *devname, int verbose, int runstop, close(mdfd); sysfs_free(sra); if (!rv) - rv = Incremental_container(st, chosen_name, homehost, - verbose, runstop, autof, - freeze_reshape); + rv = Incremental_container(st, chosen_name, c); map_unlock(&map); if (rv == 1) /* Don't fail the whole -I if a subarray didn't @@ -477,7 +469,7 @@ int Incremental(char *devname, int verbose, int runstop, if (enough(info.array.level, info.array.raid_disks, info.array.layout, info.array.state & 1, avail) == 0) { - if (verbose >= 0) + if (c->verbose >= 0) pr_err("%s attached to %s, not enough to start (%d).\n", devname, chosen_name, active_disks); rv = 0; @@ -491,7 +483,7 @@ int Incremental(char *devname, int verbose, int runstop, /* + start the array (auto-readonly). */ if (ioctl(mdfd, GET_ARRAY_INFO, &ainf) == 0) { - if (verbose >= 0) + if (c->verbose >= 0) pr_err("%s attached to %s which is already active.\n", devname, chosen_name); rv = 0; @@ -499,7 +491,7 @@ int Incremental(char *devname, int verbose, int runstop, } map_unlock(&map); - if (runstop > 0 || active_disks >= info.array.working_disks) { + if (c->runstop > 0 || active_disks >= info.array.working_disks) { struct mdinfo *dsk; /* Let's try to start it */ if (match && match->bitmap_file) { @@ -531,7 +523,7 @@ int Incremental(char *devname, int verbose, int runstop, rv = sysfs_set_str(sra, NULL, "array_state", "read-auto"); if (rv == 0) { - if (verbose >= 0) + if (c->verbose >= 0) pr_err("%s attached to %s, which has been started.\n", devname, chosen_name); rv = 0; @@ -554,7 +546,7 @@ int Incremental(char *devname, int verbose, int runstop, rv = 1; } } else { - if (verbose >= 0) + if (c->verbose >= 0) pr_err("%s attached to %s, not enough to start safely.\n", devname, chosen_name); rv = 0; @@ -639,7 +631,7 @@ static int count_active(struct supertype *st, struct mdinfo *sra, for (d = sra->devs ; d ; d = d->next) numdevs++; - for (d = sra->devs, devnum=0 ; d ; d = d->next, devnum++) { + for (d = sra->devs, devnum = 0 ; d ; d = d->next, devnum++) { char dn[30]; int dfd; int ok; @@ -657,15 +649,11 @@ static int count_active(struct supertype *st, struct mdinfo *sra, st->ss->getinfo_super(st, &info, devmap + raid_disks * devnum); if (!avail) { raid_disks = info.array.raid_disks; - avail = calloc(raid_disks, 1); - if (!avail) { - pr_err("out of memory.\n"); - exit(1); - } + avail = xcalloc(raid_disks, 1); *availp = avail; - best = calloc(raid_disks, sizeof(int)); - devmap = calloc(raid_disks * numdevs, 1); + best = xcalloc(raid_disks, sizeof(int)); + devmap = xcalloc(raid_disks, numdevs); st->ss->getinfo_super(st, &info, devmap); } @@ -691,7 +679,7 @@ static int count_active(struct supertype *st, struct mdinfo *sra, else if (info.events == max_events+1) { int i; max_events = info.events; - for (i=0; i < raid_disks; i++) + for (i = 0; i < raid_disks; i++) if (avail[i]) avail[i]--; avail[info.disk.raid_disk] = 2; @@ -835,7 +823,7 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol, if (st == NULL) { int i; st2 = NULL; - for(i=0; !st2 && superlist[i]; i++) + for(i = 0; !st2 && superlist[i]; i++) st2 = superlist[i]->match_metadata_desc( sra->text_version); if (!st2) { @@ -1325,7 +1313,7 @@ static char *container2devname(char *devname) } else { int uuid[4]; struct map_ent *mp, *map = NULL; - + if (!parse_uuid(devname, uuid)) return mdname; mp = map_by_uuid(&map, uuid); @@ -1338,8 +1326,7 @@ static char *container2devname(char *devname) } static int Incremental_container(struct supertype *st, char *devname, - char *homehost, int verbose, - int runstop, int autof, int freeze_reshape) + struct context *c) { /* Collect the contents of this container and for each * array, choose a device name and assemble the array. @@ -1361,23 +1348,23 @@ static int Incremental_container(struct supertype *st, char *devname, st->ss->getinfo_super(st, &info, NULL); - if ((runstop > 0 && info.container_enough >= 0) || + if ((c->runstop > 0 && info.container_enough >= 0) || info.container_enough > 0) /* pass */; else { - if (verbose) + if (c->verbose) pr_err("not enough devices to start the container\n"); return 0; } - match = conf_match(st, &info, devname, verbose, &rv); + match = conf_match(st, &info, devname, c->verbose, &rv); if (match == NULL && rv == 2) return rv; /* Need to compute 'trustworthy' */ if (match) trustworthy = LOCAL; - else if (st->ss->match_home(st, homehost) == 1) + else if (st->ss->match_home(st, c->homehost) == 1) trustworthy = LOCAL; else if (st->ss->match_home(st, "any") == 1) trustworthy = LOCAL; @@ -1444,7 +1431,7 @@ static int Incremental_container(struct supertype *st, char *devname, free(dn); /* we have a match */ match = array_list; - if (verbose>0) + if (c->verbose>0) pr_err("match found for member %s\n", array_list->member); break; @@ -1452,7 +1439,7 @@ static int Incremental_container(struct supertype *st, char *devname, if (match && match->devname && strcasecmp(match->devname, "") == 0) { - if (verbose > 0) + if (c->verbose > 0) pr_err("array %s/%s is " "explicitly ignored by mdadm.conf\n", match->container, match->member); @@ -1463,7 +1450,7 @@ static int Incremental_container(struct supertype *st, char *devname, mdfd = create_mddev(match ? match->devname : NULL, ra->name, - autof, + c->autof, trustworthy, chosen_name); } @@ -1474,9 +1461,8 @@ static int Incremental_container(struct supertype *st, char *devname, return 2; } - assemble_container_content(st, mdfd, ra, runstop, - chosen_name, verbose, NULL, - freeze_reshape); + assemble_container_content(st, mdfd, ra, c, + chosen_name); close(mdfd); }