X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=util.c;h=d0765a6dabad4c678fc9ec7ca7dfc069d28802b6;hp=81f936018ff4c6367a55822719ed3be0a6323a31;hb=72d566f68d495261608a900b2d8cb8d037cd9178;hpb=e5508b361d970a7657c9f81303223fa114bdcd9b diff --git a/util.c b/util.c index 81f93601..d0765a6d 100644 --- a/util.c +++ b/util.c @@ -32,6 +32,8 @@ #include #include +int __offroot; + /* * following taken from linux/blkpg.h because they aren't * anywhere else and it isn't safe to #include linux/ * stuff. @@ -146,20 +148,21 @@ int get_linux_version() { struct utsname name; char *cp; - int a,b,c; + int a = 0, b = 0,c = 0; if (uname(&name) <0) return -1; cp = name.release; a = strtoul(cp, &cp, 10); - if (*cp != '.') return -1; - b = strtoul(cp+1, &cp, 10); - if (*cp != '.') return -1; - c = strtoul(cp+1, NULL, 10); + if (*cp == '.') + b = strtoul(cp+1, &cp, 10); + if (*cp == '.') + c = strtoul(cp+1, &cp, 10); return (a*1000000)+(b*1000)+c; } +#ifndef MDASSEMBLE int mdadm_version(char *version) { int a, b, c; @@ -185,13 +188,13 @@ int mdadm_version(char *version) return (a*1000000)+(b*1000)+c; } -#ifndef MDASSEMBLE long long parse_size(char *size) { /* parse 'size' which should be a number optionally * followed by 'K', 'M', or 'G'. * Without a suffix, K is assumed. * Number returned is in sectors (half-K) + * -1 returned on error. */ char *c; long long s = strtoll(size, &c, 10); @@ -213,7 +216,7 @@ long long parse_size(char *size) } } if (*c) - s = 0; + s = -1; return s; } @@ -241,7 +244,7 @@ int parse_layout_faulty(char *layout) { /* Parse the layout string for 'faulty' */ int ln = strcspn(layout, "0123456789"); - char *m = strdup(layout); + char *m = xstrdup(layout); int mode; m[ln] = 0; mode = map_name(faultylayout, m); @@ -309,10 +312,15 @@ int test_partition_from_id(dev_t id) return rv; } -int enough(int level, int raid_disks, int layout, int clean, - char *avail, int avail_disks) +int enough(int level, int raid_disks, int layout, int clean, char *avail) { int copies, first; + int i; + int avail_disks = 0; + + for (i = 0; i < raid_disks; i++) + avail_disks += !!avail[i]; + switch (level) { case 10: /* This is the tricky one - we need to check @@ -363,17 +371,21 @@ int enough_fd(int fd) struct mdu_array_info_s array; struct mdu_disk_info_s disk; int avail_disks = 0; - int i; + int i, rv; char *avail; if (ioctl(fd, GET_ARRAY_INFO, &array) != 0 || array.raid_disks <= 0) return 0; - avail = calloc(array.raid_disks, 1); - for (i=0; i 0; i++) { disk.number = i; if (ioctl(fd, GET_DISK_INFO, &disk) != 0) continue; + if (disk.major == 0 && disk.minor == 0) + continue; + array.nr_disks--; + if (! (disk.state & (1<= array.raid_disks) @@ -382,9 +394,10 @@ int enough_fd(int fd) avail[disk.raid_disk] = 1; } /* This is used on an active array, so assume it is clean */ - return enough(array.level, array.raid_disks, array.layout, - 1, - avail, avail_disks); + rv = enough(array.level, array.raid_disks, array.layout, + 1, avail); + free(avail); + return rv; } @@ -492,7 +505,7 @@ int check_ext2(int fd, char *name) mtime = sb[44]|(sb[45]|(sb[46]|sb[47]<<8)<<8)<<8; bsize = sb[24]|(sb[25]|(sb[26]|sb[27]<<8)<<8)<<8; size = sb[4]|(sb[5]|(sb[6]|sb[7]<<8)<<8)<<8; - fprintf(stderr, Name ": %s appears to contain an ext2fs file system\n", + pr_err("%s appears to contain an ext2fs file system\n", name); fprintf(stderr," size=%dK mtime=%s", size*(1<ignore_hw_compat = 1; st->ss->load_super(st, fd, name); /* Looks like a raid array .. */ - fprintf(stderr, Name ": %s appears to be part of a raid array:\n", + pr_err("%s appears to be part of a raid array:\n", name); st->ss->getinfo_super(st, &info, NULL); st->ss->free_super(st); @@ -561,32 +575,11 @@ int ask(char *mesg) return 0; add = "(y/n) "; } - fprintf(stderr, Name ": assuming 'no'\n"); + pr_err("assuming 'no'\n"); return 0; } #endif /* MDASSEMBLE */ -char *map_num(mapping_t *map, int num) -{ - while (map->name) { - if (map->num == num) - return map->name; - map++; - } - return NULL; -} - -int map_name(mapping_t *map, char *name) -{ - while (map->name) { - if (strcmp(map->name, name)==0) - return map->num; - map++; - } - return UnSet; -} - - int is_standard(char *dev, int *nump) { /* tests if dev is a "standard" md dev name. @@ -623,122 +616,6 @@ int is_standard(char *dev, int *nump) return type; } - -/* - * convert a major/minor pair for a block device into a name in /dev, if possible. - * On the first call, walk /dev collecting name. - * Put them in a simple linked listfor now. - */ -struct devmap { - int major, minor; - char *name; - struct devmap *next; -} *devlist = NULL; -int devlist_ready = 0; - -int add_dev(const char *name, const struct stat *stb, int flag, struct FTW *s) -{ - struct stat st; - - if (S_ISLNK(stb->st_mode)) { - if (stat(name, &st) != 0) - return 0; - stb = &st; - } - - if ((stb->st_mode&S_IFMT)== S_IFBLK) { - char *n = strdup(name); - struct devmap *dm = malloc(sizeof(*dm)); - if (strncmp(n, "/dev/./", 7)==0) - strcpy(n+4, name+6); - if (dm) { - dm->major = major(stb->st_rdev); - dm->minor = minor(stb->st_rdev); - dm->name = n; - dm->next = devlist; - devlist = dm; - } - } - return 0; -} - -#ifndef HAVE_NFTW -#ifdef HAVE_FTW -int add_dev_1(const char *name, const struct stat *stb, int flag) -{ - return add_dev(name, stb, flag, NULL); -} -int nftw(const char *path, int (*han)(const char *name, const struct stat *stb, int flag, struct FTW *s), int nopenfd, int flags) -{ - return ftw(path, add_dev_1, nopenfd); -} -#else -int nftw(const char *path, int (*han)(const char *name, const struct stat *stb, int flag, struct FTW *s), int nopenfd, int flags) -{ - return 0; -} -#endif /* HAVE_FTW */ -#endif /* HAVE_NFTW */ - -/* - * Find a block device with the right major/minor number. - * If we find multiple names, choose the shortest. - * If we find a name in /dev/md/, we prefer that. - * This applies only to names for MD devices. - */ -char *map_dev(int major, int minor, int create) -{ - struct devmap *p; - char *regular = NULL, *preferred=NULL; - int did_check = 0; - - if (major == 0 && minor == 0) - return NULL; - - retry: - if (!devlist_ready) { - char *dev = "/dev"; - struct stat stb; - while(devlist) { - struct devmap *d = devlist; - devlist = d->next; - free(d->name); - free(d); - } - if (lstat(dev, &stb)==0 && - S_ISLNK(stb.st_mode)) - dev = "/dev/."; - nftw(dev, add_dev, 10, FTW_PHYS); - devlist_ready=1; - did_check = 1; - } - - for (p=devlist; p; p=p->next) - if (p->major == major && - p->minor == minor) { - if (strncmp(p->name, "/dev/md/",8) == 0) { - if (preferred == NULL || - strlen(p->name) < strlen(preferred)) - preferred = p->name; - } else { - if (regular == NULL || - strlen(p->name) < strlen(regular)) - regular = p->name; - } - } - if (!regular && !preferred && !did_check) { - devlist_ready = 0; - goto retry; - } - if (create && !regular && !preferred) { - static char buf[30]; - snprintf(buf, sizeof(buf), "%d:%d", major, minor); - regular = buf; - } - - return preferred ? preferred : regular; -} - unsigned long calc_csum(void *super, int bytes) { unsigned long long newcsum = 0; @@ -772,7 +649,7 @@ char *human_size(long long bytes) * We allow upto 2048Megabytes before converting to * gigabytes, as that shows more precision and isn't * too large a number. - * Terrabytes are not yet handled. + * Terabytes are not yet handled. */ if (bytes < 5000*1024) @@ -834,6 +711,14 @@ void print_r10_layout(int layout) unsigned long long calc_array_size(int level, int raid_disks, int layout, int chunksize, unsigned long long devsize) +{ + if (level == 1) + return devsize; + devsize &= ~(unsigned long long)((chunksize>>9)-1); + return get_data_disks(level, layout, raid_disks) * devsize; +} + +int get_data_disks(int level, int layout, int raid_disks) { int data_disks = 0; switch (level) { @@ -845,36 +730,8 @@ unsigned long long calc_array_size(int level, int raid_disks, int layout, case 10: data_disks = raid_disks / (layout & 255) / ((layout>>8)&255); break; } - devsize &= ~(unsigned long long)((chunksize>>9)-1); - return data_disks * devsize; -} -int get_mdp_major(void) -{ -static int mdp_major = -1; - FILE *fl; - char *w; - int have_block = 0; - int have_devices = 0; - int last_num = -1; - - if (mdp_major != -1) - return mdp_major; - fl = fopen("/proc/devices", "r"); - if (!fl) - return -1; - while ((w = conf_word(fl, 1))) { - if (have_block && strcmp(w, "devices:")==0) - have_devices = 1; - have_block = (strcmp(w, "Block")==0); - if (isdigit(w[0])) - last_num = atoi(w); - if (have_devices && strcmp(w, "mdp")==0) - mdp_major = last_num; - free(w); - } - fclose(fl); - return mdp_major; + return data_disks; } #if !defined(MDASSEMBLE) || defined(MDASSEMBLE) && defined(MDASSEMBLE_AUTO) @@ -998,24 +855,34 @@ int dev_open(char *dev, int flags) return fd; } -int open_dev(int devnum) +int open_dev_flags(int devnum, int flags) { char buf[20]; sprintf(buf, "%d:%d", dev2major(devnum), dev2minor(devnum)); - return dev_open(buf, O_RDWR); + return dev_open(buf, flags); +} + +int open_dev(int devnum) +{ + return open_dev_flags(devnum, O_RDONLY); } int open_dev_excl(int devnum) { char buf[20]; int i; + int flags = O_RDWR; sprintf(buf, "%d:%d", dev2major(devnum), dev2minor(devnum)); for (i=0 ; i<25 ; i++) { - int fd = dev_open(buf, O_RDWR|O_EXCL); + int fd = dev_open(buf, flags|O_EXCL); if (fd >= 0) return fd; + if (errno == EACCES && flags == O_RDWR) { + flags = O_RDONLY; + continue; + } if (errno != EBUSY) return fd; usleep(200000); @@ -1102,9 +969,10 @@ struct supertype *super_by_fd(int fd, char **subarrayp) char *dev = verstr+1; subarray = strchr(dev, '/'); - if (subarray) + if (subarray) { *subarray++ = '\0'; - subarray = strdup(subarray); + subarray = xstrdup(subarray); + } container = devname2devnum(dev); if (sra) sysfs_free(sra); @@ -1156,10 +1024,7 @@ struct supertype *dup_super(struct supertype *orig) if (!orig) return orig; - st = malloc(sizeof(*st)); - if (!st) - return st; - memset(st, 0, sizeof(*st)); + st = xcalloc(1, sizeof(*st)); st->ss = orig->ss; st->max_devs = orig->max_devs; st->minor_version = orig->minor_version; @@ -1179,8 +1044,7 @@ struct supertype *guess_super_type(int fd, enum guess_types guess_type) int bestsuper = -1; int i; - st = malloc(sizeof(*st)); - memset(st, 0, sizeof(*st)); + st = xcalloc(1, sizeof(*st)); st->container_dev = NoMdDev; for (i=0 ; superlist[i]; i++) { @@ -1191,6 +1055,7 @@ struct supertype *guess_super_type(int fd, enum guess_types guess_type) if (guess_type == guess_partitions && ss->add_to_super != NULL) continue; memset(st, 0, sizeof(*st)); + st->ignore_hw_compat = 1; rv = ss->load_super(st, fd, NULL); if (rv == 0) { struct mdinfo info; @@ -1206,9 +1071,11 @@ struct supertype *guess_super_type(int fd, enum guess_types guess_type) if (bestsuper != -1) { int rv; memset(st, 0, sizeof(*st)); + st->ignore_hw_compat = 1; rv = superlist[bestsuper]->load_super(st, fd, NULL); if (rv == 0) { superlist[bestsuper]->free_super(st); + st->ignore_hw_compat = 0; return st; } } @@ -1235,7 +1102,7 @@ int get_dev_size(int fd, char *dname, unsigned long long *sizep) ldsize <<= 9; } else { if (dname) - fprintf(stderr, Name ": Cannot get size of %s: %s\b", + pr_err("Cannot get size of %s: %s\b", dname, strerror(errno)); return 0; } @@ -1267,9 +1134,9 @@ int must_be_container(int fd) static int get_gpt_last_partition_end(int fd, unsigned long long *endofpart) { struct GPT gpt; - unsigned char buf[512]; unsigned char empty_gpt_entry[16]= {0}; struct GPT_part_entry *part; + char buf[512]; unsigned long long curr_part_end; unsigned all_partitions, entry_size; unsigned part_nr; @@ -1277,8 +1144,9 @@ static int get_gpt_last_partition_end(int fd, unsigned long long *endofpart) *endofpart = 0; BUILD_BUG_ON(sizeof(gpt) != 512); - /* read GPT header */ + /* skip protective MBR */ lseek(fd, 512, SEEK_SET); + /* read GPT header */ if (read(fd, &gpt, 512) != 512) return 0; @@ -1292,16 +1160,16 @@ static int get_gpt_last_partition_end(int fd, unsigned long long *endofpart) /* sanity checks */ if (all_partitions > 1024 || - entry_size > 512) + entry_size > sizeof(buf)) return -1; - /* read first GPT partition entries */ - if (read(fd, buf, 512) != 512) - return 0; - - part = (struct GPT_part_entry*)buf; + part = (struct GPT_part_entry *)buf; for (part_nr=0; part_nr < all_partitions; part_nr++) { + /* read partition entry */ + if (read(fd, buf, entry_size) != (ssize_t)entry_size) + return 0; + /* is this valid partition? */ if (memcmp(part->type_guid, empty_gpt_entry, 16) != 0) { /* check the last lba for the current partition */ @@ -1310,13 +1178,6 @@ static int get_gpt_last_partition_end(int fd, unsigned long long *endofpart) *endofpart = curr_part_end; } - part = (struct GPT_part_entry*)((unsigned char*)part + entry_size); - - if ((unsigned char *)part >= buf + 512) { - if (read(fd, buf, 512) != 512) - return 0; - part = (struct GPT_part_entry*)buf; - } } return 1; } @@ -1370,7 +1231,8 @@ static int get_last_partition_end(int fd, unsigned long long *endofpart) return retval; } -int check_partitions(int fd, char *dname, unsigned long long freesize) +int check_partitions(int fd, char *dname, unsigned long long freesize, + unsigned long long size) { /* * Check where the last partition ends @@ -1382,16 +1244,19 @@ int check_partitions(int fd, char *dname, unsigned long long freesize) /* There appears to be a partition table here */ if (freesize == 0) { /* partitions will not be visible in new device */ - fprintf(stderr, - Name ": partition table exists on %s but will be lost or\n" - " meaningless after creating array\n", - dname); + pr_err("partition table exists on %s but will be lost or\n" + " meaningless after creating array\n", + dname); return 1; } else if (endofpart > freesize) { /* last partition overlaps metadata */ - fprintf(stderr, - Name ": metadata will over-write last partition on %s.\n", - dname); + pr_err("metadata will over-write last partition on %s.\n", + dname); + return 1; + } else if (size && endofpart > size) { + /* partitions will be truncated in new device */ + pr_err("array size is too small to cover all partitions on %s.\n", + dname); return 1; } } @@ -1401,10 +1266,13 @@ int check_partitions(int fd, char *dname, unsigned long long freesize) void get_one_disk(int mdfd, mdu_array_info_t *ainf, mdu_disk_info_t *disk) { int d; + ioctl(mdfd, GET_ARRAY_INFO, ainf); - for (d = 0 ; d < ainf->raid_disks + ainf->nr_disks ; d++) - if (ioctl(mdfd, GET_DISK_INFO, disk) == 0) + for (d = 0 ; d < MAX_DISKS ; d++) { + if (ioctl(mdfd, GET_DISK_INFO, disk) == 0 && + (disk->major || disk->minor)) return; + } } int open_container(int fd) @@ -1514,59 +1382,57 @@ int open_subarray(char *dev, char *subarray, struct supertype *st, int quiet) fd = open(dev, O_RDWR|O_EXCL); if (fd < 0) { if (!quiet) - fprintf(stderr, Name ": Couldn't open %s, aborting\n", + pr_err("Couldn't open %s, aborting\n", dev); - return 2; + return -1; } st->devnum = fd2devnum(fd); if (st->devnum == NoMdDev) { if (!quiet) - fprintf(stderr, - Name ": Failed to determine device number for %s\n", - dev); + pr_err("Failed to determine device number for %s\n", + dev); goto close_fd; } mdi = sysfs_read(fd, st->devnum, GET_VERSION|GET_LEVEL); if (!mdi) { if (!quiet) - fprintf(stderr, Name ": Failed to read sysfs for %s\n", + pr_err("Failed to read sysfs for %s\n", dev); goto close_fd; } if (mdi->array.level != UnSet) { if (!quiet) - fprintf(stderr, Name ": %s is not a container\n", dev); + pr_err("%s is not a container\n", dev); goto free_sysfs; } st->ss = version_to_superswitch(mdi->text_version); if (!st->ss) { if (!quiet) - fprintf(stderr, - Name ": Operation not supported for %s metadata\n", - mdi->text_version); + pr_err("Operation not supported for %s metadata\n", + mdi->text_version); goto free_sysfs; } st->devname = devnum2devname(st->devnum); if (!st->devname) { if (!quiet) - fprintf(stderr, Name ": Failed to allocate device name\n"); + pr_err("Failed to allocate device name\n"); goto free_sysfs; } if (!st->ss->load_container) { if (!quiet) - fprintf(stderr, Name ": %s is not a container\n", dev); + pr_err("%s is not a container\n", dev); goto free_name; } if (st->ss->load_container(st, fd, NULL)) { if (!quiet) - fprintf(stderr, Name ": Failed to load metadata for %s\n", + pr_err("Failed to load metadata for %s\n", dev); goto free_name; } @@ -1574,7 +1440,7 @@ int open_subarray(char *dev, char *subarray, struct supertype *st, int quiet) info = st->ss->container_content(st, subarray); if (!info) { if (!quiet) - fprintf(stderr, Name ": Failed to find subarray-%s in %s\n", + pr_err("Failed to find subarray-%s in %s\n", subarray, dev); goto free_super; } @@ -1618,7 +1484,7 @@ int add_disk(int mdfd, struct supertype *st, if (sd2 == info) break; if (sd2 == NULL) { - sd2 = malloc(sizeof(*sd2)); + sd2 = xmalloc(sizeof(*sd2)); *sd2 = *info; sd2->next = sra->devs; sra->devs = sd2; @@ -1685,73 +1551,6 @@ unsigned long long min_recovery_start(struct mdinfo *array) return recovery_start; } -void fmt_devname(char *name, int num) -{ - if (num >= 0) - sprintf(name, "md%d", num); - else - sprintf(name, "md_d%d", -1-num); -} - -char *devnum2devname(int num) -{ - char name[100]; - fmt_devname(name,num); - return strdup(name); -} - -int devname2devnum(char *name) -{ - char *ep; - int num; - if (strncmp(name, "md_d", 4)==0) - num = -1-strtoul(name+4, &ep, 10); - else - num = strtoul(name+2, &ep, 10); - return num; -} - -int stat2devnum(struct stat *st) -{ - char path[30]; - char link[200]; - char *cp; - int n; - - if ((S_IFMT & st->st_mode) == S_IFBLK) { - if (major(st->st_rdev) == MD_MAJOR) - return minor(st->st_rdev); - else if (major(st->st_rdev) == (unsigned)get_mdp_major()) - return -1- (minor(st->st_rdev)>>MdpMinorShift); - - /* must be an extended-minor partition. Look at the - * /sys/dev/block/%d:%d link which must look like - * ../../block/mdXXX/mdXXXpYY - */ - sprintf(path, "/sys/dev/block/%d:%d", major(st->st_rdev), - minor(st->st_rdev)); - n = readlink(path, link, sizeof(link)-1); - if (n <= 0) - return NoMdDev; - link[n] = 0; - cp = strrchr(link, '/'); - if (cp) *cp = 0; - cp = strrchr(link, '/'); - if (cp && strncmp(cp, "/md", 3) == 0) - return devname2devnum(cp+1); - } - return NoMdDev; - -} - -int fd2devnum(int fd) -{ - struct stat stb; - if (fstat(fd, &stb) == 0) - return stat2devnum(&stb); - return NoMdDev; -} - int mdmon_pid(int devnum) { char path[100]; @@ -1786,7 +1585,7 @@ int mdmon_running(int devnum) int start_mdmon(int devnum) { - int i; + int i, skipped; int len; pid_t pid; int status; @@ -1801,7 +1600,7 @@ int start_mdmon(int devnum) if (check_env("MDADM_NO_MDMON")) return 0; - len = readlink("/proc/self/exe", pathbuf, sizeof(pathbuf)); + len = readlink("/proc/self/exe", pathbuf, sizeof(pathbuf)-1); if (len > 0) { char *sl; pathbuf[len] = 0; @@ -1817,15 +1616,27 @@ int start_mdmon(int devnum) switch(fork()) { case 0: /* FIXME yuk. CLOSE_EXEC?? */ - for (i=3; i < 100; i++) - close(i); + skipped = 0; + for (i=3; skipped < 20; i++) + if (close(i) < 0) + skipped++; + else + skipped = 0; + for (i=0; paths[i]; i++) - if (paths[i][0]) - execl(paths[i], "mdmon", - devnum2devname(devnum), - NULL); + if (paths[i][0]) { + if (__offroot) { + execl(paths[i], "mdmon", "--offroot", + devnum2devname(devnum), + NULL); + } else { + execl(paths[i], "mdmon", + devnum2devname(devnum), + NULL); + } + } exit(1); - case -1: fprintf(stderr, Name ": cannot run mdmon. " + case -1: pr_err("cannot run mdmon. " "Array remains readonly\n"); return -1; default: /* parent - good */ @@ -1889,7 +1700,7 @@ int flush_metadata_updates(struct supertype *st) void append_metadata_update(struct supertype *st, void *buf, int len) { - struct metadata_update *mu = malloc(sizeof(*mu)); + struct metadata_update *mu = xmalloc(sizeof(*mu)); mu->buf = buf; mu->len = len; @@ -1911,7 +1722,8 @@ int experimental(void) if (check_env("MDADM_EXPERIMENTAL")) return 1; else { - fprintf(stderr, Name ": To use this feature MDADM_EXPERIMENTAL enviroment variable has to defined.\n"); + pr_err("To use this feature MDADM_EXPERIMENTAL" + " environment variable has to be defined.\n"); return 0; } } @@ -1976,3 +1788,43 @@ struct mdinfo *container_choose_spares(struct supertype *st, } return disks; } + +void *xmalloc(size_t len) +{ + void *rv = malloc(len); + char *msg; + if (rv) + return rv; + msg = Name ": memory allocation failure - aborting\n"; + exit(4+!!write(2, msg, strlen(msg))); +} + +void *xrealloc(void *ptr, size_t len) +{ + void *rv = realloc(ptr, len); + char *msg; + if (rv) + return rv; + msg = Name ": memory allocation failure - aborting\n"; + exit(4+!!write(2, msg, strlen(msg))); +} + +void *xcalloc(size_t num, size_t size) +{ + void *rv = calloc(num, size); + char *msg; + if (rv) + return rv; + msg = Name ": memory allocation failure - aborting\n"; + exit(4+!!write(2, msg, strlen(msg))); +} + +char *xstrdup(const char *str) +{ + char *rv = strdup(str); + char *msg; + if (rv) + return rv; + msg = Name ": memory allocation failure - aborting\n"; + exit(4+!!write(2, msg, strlen(msg))); +}