X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=mdopen.c;h=f818fdf339eb9314eae07fd24b96c5229d0baf43;hb=36138e4e4b6c3f9db21e65ac8962bf22d4b2c274;hp=7dfa0ba5d581d73a4801cc77b7dc56471333313a;hpb=69207ff6ac9d905c096597de4f37ff9524265d9b;p=thirdparty%2Fmdadm.git diff --git a/mdopen.c b/mdopen.c index 7dfa0ba5..f818fdf3 100644 --- a/mdopen.c +++ b/mdopen.c @@ -1,7 +1,7 @@ /* * mdadm - manage Linux "md" devices aka RAID arrays. * - * Copyright (C) 2001-2006 Neil Brown + * Copyright (C) 2001-2013 Neil Brown * * * This program is free software; you can redistribute it and/or modify @@ -19,63 +19,60 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Author: Neil Brown - * Email: - * Paper: Neil Brown - * School of Computer Science and Engineering - * The University of New South Wales - * Sydney, 2052 - * Australia + * Email: */ #include "mdadm.h" #include "md_p.h" #include - -void make_dev_symlink(char *dev) -{ - char *new = strdup(dev); - - if (!new) return; - /* /dev/md/0 -> /dev/md0 - * /dev/md/d0 -> /dev/md_d0 - */ - if (isdigit(new[8])) - strcpy(new+7, new+8); - else - new[7] = '_'; - if (symlink(dev+5, new)) - perror(new); -} - - -void make_parts(char *dev, int cnt, int symlinks) +void make_parts(char *dev, int cnt) { /* make 'cnt' partition devices for 'dev' - * We use the major/minor from dev and add 1..cnt + * If dev is a device name we use the + * major/minor from dev and add 1..cnt + * If it is a symlink, we make similar symlinks. * If dev ends with a digit, we add "p%d" else "%d" * If the name exists, we use it's owner/mode, * else that of dev */ struct stat stb; - int major_num, minor_num; + int major_num; + int minor_num; + int odig; int i; int nlen = strlen(dev) + 20; - char *name = malloc(nlen); + char *name; int dig = isdigit(dev[strlen(dev)-1]); + char orig[1024]; + char sym[1024]; + int err; - if (cnt==0) cnt=4; - if (stat(dev, &stb)!= 0) + if (cnt == 0) + cnt = 4; + if (lstat(dev, &stb)!= 0) return; - if (!S_ISBLK(stb.st_mode)) + + if (S_ISBLK(stb.st_mode)) { + major_num = major(stb.st_rdev); + minor_num = minor(stb.st_rdev); + odig = -1; + } else if (S_ISLNK(stb.st_mode)) { + int len = readlink(dev, orig, sizeof(orig)); + if (len < 0 || len > 1000) + return; + orig[len] = 0; + odig = isdigit(orig[len-1]); + major_num = -1; + minor_num = -1; + } else return; - major_num = major(stb.st_rdev); - minor_num = minor(stb.st_rdev); - for (i=1; i <= cnt ; i++) { + name = xmalloc(nlen); + for (i = 1; i <= cnt ; i++) { struct stat stb2; snprintf(name, nlen, "%s%s%d", dev, dig?"p":"", i); - if (stat(name, &stb2)==0) { - if (!S_ISBLK(stb2.st_mode)) + if (stat(name, &stb2) == 0) { + if (!S_ISBLK(stb2.st_mode) || !S_ISBLK(stb.st_mode)) continue; if (stb2.st_rdev == makedev(major_num, minor_num+i)) continue; @@ -83,20 +80,26 @@ void make_parts(char *dev, int cnt, int symlinks) } else { stb2 = stb; } - if (mknod(name, S_IFBLK | 0600, makedev(major_num, minor_num+i))) - perror("mknod"); - if (chown(name, stb2.st_uid, stb2.st_gid)) - perror("chown"); - if (chmod(name, stb2.st_mode & 07777)) - perror("chmod"); - if (symlinks && strncmp(name, "/dev/md/", 8) == 0) - make_dev_symlink(name); - stat(name, &stb2); - add_dev(name, &stb2, 0, NULL); + if (S_ISBLK(stb.st_mode)) { + if (mknod(name, S_IFBLK | 0600, + makedev(major_num, minor_num+i))) + perror("mknod"); + if (chown(name, stb2.st_uid, stb2.st_gid)) + perror("chown"); + if (chmod(name, stb2.st_mode & 07777)) + perror("chmod"); + err = 0; + } else { + snprintf(sym, sizeof(sym), "%s%s%d", orig, odig?"p":"", i); + err = symlink(sym, name); + } + + if (err == 0 && stat(name, &stb2) == 0) + add_dev(name, &stb2, 0, NULL); } + free(name); } - /* * We need a new md device to assemble/build/create an array. * 'dev' is a name given us by the user (command line or mdadm.conf) @@ -121,9 +124,9 @@ void make_parts(char *dev, int cnt, int symlinks) * supported by 'dev', we add a "_%d" suffix based on the minor number * use that. * - * If udev is configured, we create a temporary device, open it, and + * If udev is configured, we create a temporary device, open it, and * unlink it. - * If not, we create the /dev/mdXX device, and is name is usable, + * If not, we create the /dev/mdXX device, and if name is usable, * /dev/md/name * In any case we return /dev/md/name or (if that isn't available) * /dev/mdXX in 'chosen'. @@ -142,11 +145,11 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy, int parts; char *cname; char devname[20]; + char devnm[32]; char cbuf[400]; if (chosen == NULL) chosen = cbuf; - if (autof == 0) autof = ci->autof; @@ -156,9 +159,7 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy, strcpy(chosen, "/dev/md/"); cname = chosen + strlen(chosen); - if (dev) { - if (strncmp(dev, "/dev/md/", 8) == 0) { strcpy(cname, dev+8); } else if (strncmp(dev, "/dev/", 5) == 0) { @@ -172,8 +173,7 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy, /* name *must* be mdXX or md_dXX in this context */ if (num < 0 || (strcmp(cname, "md") != 0 && strcmp(cname, "md_d") != 0)) { - fprintf(stderr, Name ": %s is an invalid name " - "for an md device. Try /dev/md/%s\n", + pr_err("%s is an invalid name for an md device. Try /dev/md/%s\n", dev, dev+5); return -1; } @@ -181,25 +181,41 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy, use_mdp = 0; else use_mdp = 1; + /* recreate name: /dev/md/0 or /dev/md/d0 */ + sprintf(cname, "%s%d", use_mdp?"d":"", num); } else strcpy(cname, dev); - /* 'cname' must not contain a slash, may not start or end - * with a digit, and may only be empty if num is present. + /* 'cname' must not contain a slash, and may not be + * empty. */ - if (strchr(cname, '/') != NULL || - isdigit(cname[0]) || - (cname[0] && isdigit(cname[strlen(cname)])) - ) { - fprintf(stderr, Name ": %s is an invalid name " - "for an md device.\n", dev); + if (strchr(cname, '/') != NULL) { + pr_err("%s is an invalid name for an md device.\n", dev); return -1; } - if (cname[0] == 0 && num < 0) { - fprintf(stderr, Name ": %s is an invalid name " - "for an md device (empty!).", dev); + if (cname[0] == 0) { + pr_err("%s is an invalid name for an md device (empty!).", dev); return -1; } + if (num < 0) { + /* If cname is 'N' or 'dN', we get dev number + * from there. + */ + char *sp = cname; + char *ep; + if (cname[0] == 'd') + sp++; + if (isdigit(sp[0])) + num = strtoul(sp, &ep, 10); + else + ep = sp; + if (ep == sp || *ep || num < 0) + num = -1; + else if (cname[0] == 'd') + use_mdp = 1; + else + use_mdp = 0; + } } /* Now determine device number */ @@ -207,8 +223,7 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy, if (name && name[0] == 0) name = NULL; if (name && trustworthy == METADATA && use_mdp == 1) { - fprintf(stderr, Name ": %s is not allowed for a %s container. " - "Consider /dev/md%d.\n", dev, name, num); + pr_err("%s is not allowed for a %s container. Consider /dev/md%d.\n", dev, name, num); return -1; } if (name && trustworthy == METADATA) @@ -220,76 +235,128 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy, use_mdp = 0; } if (num < 0 && trustworthy == LOCAL && name) { - /* if name is numeric, us that for num */ + /* if name is numeric, possibly prefixed by + * 'md' or '/dev/md', use that for num + * if it is not already in use */ char *ep; - num = strtoul(name, &ep, 10); - if (ep == name || *ep) + char *n2 = name; + if (strncmp(n2, "/dev/", 5) == 0) + n2 += 5; + if (strncmp(n2, "md", 2) == 0) + n2 += 2; + if (*n2 == '/') + n2++; + num = strtoul(n2, &ep, 10); + if (ep == n2 || *ep) num = -1; - } - - if (num < 0) { - /* need to choose a free number. */ - num = find_free_devnum(use_mdp); - if (num == NoMdDev) { - fprintf(stderr, Name ": No avail md devices - aborting\n"); - return -1; - } - } else { - num = use_mdp ? (-1-num) : num; - if (mddev_busy(num)) { - fprintf(stderr, Name ": %s is already in use.\n", - dev); - return -1; + else { + sprintf(devnm, "md%s%d", use_mdp ? "_d":"", num); + if (mddev_busy(devnm)) + num = -1; } } - if (num < 0) - sprintf(devname, "/dev/md_d%d", -1-num); - else - sprintf(devname, "/dev/md%d", num); - if (cname[0] == 0 && name) { /* Need to find a name if we can * We don't completely trust 'name'. Truncate to * reasonable length and remove '/' */ char *cp; + struct map_ent *map = NULL; + int conflict = 1; + int unum = 0; + int cnlen; strncpy(cname, name, 200); cname[200] = 0; - while ((cp = strchr(cname, '/')) != NULL) - *cp = '-'; - if (trustworthy == METADATA) - /* always add device number to metadata */ - sprintf(cname+strlen(cname), "%d", num); - else if (trustworthy == FOREIGN && - strchr(cname, ':') == NULL) - /* add _%d to FOREIGN array that don't have - * a 'host:' prefix - */ - sprintf(cname+strlen(cname), "_%d", num<0?(-1-num):num); + for (cp = cname; *cp ; cp++) + switch (*cp) { + case '/': + *cp = '-'; + break; + case ' ': + case '\t': + *cp = '_'; + break; + } + + if (trustworthy == LOCAL || + (trustworthy == FOREIGN && strchr(cname, ':') != NULL)) { + /* Only need suffix if there is a conflict */ + if (map_by_name(&map, cname) == NULL) + conflict = 0; + } + cnlen = strlen(cname); + while (conflict) { + if (trustworthy == METADATA && !isdigit(cname[cnlen-1])) + sprintf(cname+cnlen, "%d", unum); + else + /* add _%d to FOREIGN array that don't + * a 'host:' prefix + */ + sprintf(cname+cnlen, "_%d", unum); + unum++; + if (map_by_name(&map, cname) == NULL) + conflict = 0; + } + } + + devnm[0] = 0; + if (num < 0 && cname && ci->names) { + int fd; + int n = -1; + sprintf(devnm, "md_%s", cname); + fd = open("/sys/module/md_mod/parameters/new_array", O_WRONLY); + if (fd >= 0) { + n = write(fd, devnm, strlen(devnm)); + close(fd); + } + if (n < 0) + devnm[0] = 0; } - if (cname[0] == 0) + if (devnm[0]) + ; + else if (num < 0) { + /* need to choose a free number. */ + char *_devnm = find_free_devnm(use_mdp); + if (devnm == NULL) { + pr_err("No avail md devices - aborting\n"); + return -1; + } + strcpy(devnm, _devnm); + } else { + sprintf(devnm, "%s%d", use_mdp?"md_d":"md", num); + if (mddev_busy(devnm)) { + pr_err("%s is already in use.\n", + dev); + return -1; + } + } + + sprintf(devname, "/dev/%s", devnm); + + if (dev && dev[0] == '/') + strcpy(chosen, dev); + else if (cname[0] == 0) strcpy(chosen, devname); /* We have a device number and name. - * If we can detect udev, just open the device and we - * are done. + * If we cannot detect udev, we need to make + * devices and links ourselves. */ - if (stat("/dev/.udev", &stb) != 0 || - check_env("MDADM_NO_UDEV")) { + if (!use_udev()) { /* Make sure 'devname' exists and 'chosen' is a symlink to it */ if (lstat(devname, &stb) == 0) { /* Must be the correct device, else error */ if ((stb.st_mode&S_IFMT) != S_IFBLK || - stb.st_rdev != makedev(dev2major(num),dev2minor(num))) { - fprintf(stderr, Name ": %s exists but looks wrong, please fix\n", + stb.st_rdev != devnm2devid(devnm)) { + pr_err("%s exists but looks wrong, please fix\n", devname); return -1; } } else { if (mknod(devname, S_IFBLK|0600, - makedev(dev2major(num),dev2minor(num))) != 0) { - fprintf(stderr, Name ": failed to create %s\n", + devnm2devid(devnm)) != 0) { + pr_err("failed to create %s\n", devname); return -1; } @@ -300,9 +367,11 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy, stat(devname, &stb); add_dev(devname, &stb, 0, NULL); } - if (strcmp(chosen, devname) != 0) { + if (use_mdp == 1) + make_parts(devname, parts); - if (mkdir("/dev/md",0700)==0) { + if (strcmp(chosen, devname) != 0) { + if (mkdir("/dev/md",0700) == 0) { if (chown("/dev/md", ci->uid, ci->gid)) perror("chown /dev/md"); if (chmod("/dev/md", ci->mode| ((ci->mode>>2) & 0111))) @@ -315,25 +384,31 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy, if (lstat(chosen, &stb) == 0) { char buf[300]; + ssize_t link_len = readlink(chosen, buf, sizeof(buf)-1); + if (link_len >= 0) + buf[link_len] = '\0'; + if ((stb.st_mode & S_IFMT) != S_IFLNK || - readlink(chosen, buf, 300) <0 || + link_len < 0 || strcmp(buf, devname) != 0) { - fprintf(stderr, Name ": %s exists - ignoring\n", + pr_err("%s exists - ignoring\n", chosen); strcpy(chosen, devname); } - } else - symlink(devname, chosen); + } else if (symlink(devname, chosen) != 0) + pr_err("failed to create %s: %s\n", + chosen, strerror(errno)); + if (use_mdp && strcmp(chosen, devname) != 0) + make_parts(chosen, parts); } } - mdfd = open_dev_excl(num); + mdfd = open_dev_excl(devnm); if (mdfd < 0) - fprintf(stderr, Name ": unexpected failure opening %s\n", + pr_err("unexpected failure opening %s\n", devname); return mdfd; } - /* Open this and check that it is an md device. * On success, return filedescriptor. * On failure, return -1 if it doesn't exist, @@ -342,98 +417,52 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy, int open_mddev(char *dev, int report_errors) { int mdfd = open(dev, O_RDWR); + if (mdfd < 0 && errno == EACCES) + mdfd = open(dev, O_RDONLY); if (mdfd < 0) { if (report_errors) - fprintf(stderr, Name ": error opening %s: %s\n", + pr_err("error opening %s: %s\n", dev, strerror(errno)); return -1; } if (md_get_version(mdfd) <= 0) { close(mdfd); if (report_errors) - fprintf(stderr, Name ": %s does not appear to be " - "an md device\n", dev); + pr_err("%s does not appear to be an md device\n", dev); return -2; } return mdfd; } - -int create_mddev_devnum(char *devname, int devnum, char *name, - char *chosen_name, int parts) +char *find_free_devnm(int use_partitions) { - /* Open the md device with number 'devnum', possibly using 'devname', - * possibly constructing a name with 'name', but in any case, copying - * the name into 'chosen_name' - */ - int major_num, minor_num; - struct stat stb; - int i; - struct createinfo *ci = conf_get_create_info(); + static char devnm[32]; + int devnum; + for (devnum = 127; devnum != 128; + devnum = devnum ? devnum-1 : (1<<9)-1) { - if (devname) - strcpy(chosen_name, devname); - else if (name && *name && name[0] && strchr(name,'/') == NULL) { - char *n = strchr(name, ':'); - if (n) n++; else n = name; - if (isdigit(*n) && devnum < 0) - sprintf(chosen_name, "/dev/md/d%s", n); - else - sprintf(chosen_name, "/dev/md/%s", n); - } else { - if (devnum >= 0) - sprintf(chosen_name, "/dev/md%d", devnum); + if (use_partitions) + sprintf(devnm, "md_d%d", devnum); else - sprintf(chosen_name, "/dev/md/d%d", -1-devnum); - } - if (devnum >= 0) { - major_num = MD_MAJOR; - minor_num = devnum; - } else { - major_num = get_mdp_major(); - minor_num = (-1-devnum) << 6; - } - if (stat(chosen_name, &stb) == 0) { - /* It already exists. Check it is right. */ - if ( ! S_ISBLK(stb.st_mode) || - stb.st_rdev != makedev(major_num, minor_num)) { - errno = EEXIST; - return -1; - } - } else { - /* special case: if --incremental is suggesting a name - * in /dev/md/, we make sure the directory exists. - */ - if (strncmp(chosen_name, "/dev/md/", 8) == 0) { - if (mkdir("/dev/md",0700)==0) { - if (chown("/dev/md", ci->uid, ci->gid)) - perror("chown /dev/md"); - if (chmod("/dev/md", ci->mode| - ((ci->mode>>2) & 0111))) - perror("chmod /dev/md"); + sprintf(devnm, "md%d", devnum); + if (mddev_busy(devnm)) + continue; + if (!conf_name_is_free(devnm)) + continue; + if (!use_udev()) { + /* make sure it is new to /dev too, at least as a + * non-standard */ + dev_t devid = devnm2devid(devnm); + if (devid) { + char *dn = map_dev(major(devid), + minor(devid), 0); + if (dn && ! is_standard(dn, NULL)) + continue; } } - - if (mknod(chosen_name, S_IFBLK | 0600, - makedev(major_num, minor_num)) != 0) { - return -1; - } - /* FIXME chown/chmod ?? */ - } - - /* Simple locking to avoid --incr being called for the same - * array multiple times in parallel. - */ - for (i = 0; i < 25 ; i++) { - int fd; - - fd = open(chosen_name, O_RDWR|O_EXCL); - if (fd >= 0 || errno != EBUSY) { - if (devnum < 0) - make_parts(chosen_name, parts, ci->symlinks); - return fd; - } - usleep(200000); + break; } - return -1; + if (devnum == 128) + return NULL; + return devnm; }