From 948fb73b04fa9b0f9a9e81e08040b79b65826a16 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Sun, 8 Nov 2015 11:48:28 +0000 Subject: New upstream release. --- config.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'config.c') diff --git a/config.c b/config.c index 909f83f4..a882ed33 100644 --- a/config.c +++ b/config.c @@ -167,10 +167,10 @@ struct mddev_dev *load_containers(void) !is_subarray(&ent->metadata_version[9])) { d = xmalloc(sizeof(*d)); memset(d, 0, sizeof(*d)); - me = map_by_devnm(&map, ent->dev); + me = map_by_devnm(&map, ent->devnm); if (me) d->devname = xstrdup(me->path); - else if (asprintf(&d->devname, "/dev/%s", ent->dev) < 0) { + else if (asprintf(&d->devname, "/dev/%s", ent->devnm) < 0) { free(d); continue; } @@ -396,14 +396,12 @@ void arrayline(char *line) ) { /* This is acceptable */; if (mis.devname) - pr_err("only give one " - "device per ARRAY line: %s and %s\n", + pr_err("only give one device per ARRAY line: %s and %s\n", mis.devname, w); else mis.devname = w; }else { - pr_err("%s is an invalid name for " - "an md device - ignored.\n", w); + pr_err("%s is an invalid name for an md device - ignored.\n", w); } } else if (strncasecmp(w, "uuid=", 5)==0 ) { if (mis.uuid_set) @@ -1121,8 +1119,7 @@ struct mddev_ident *conf_match(struct supertype *st, !array_list->devices && array_list->super_minor == UnSet) { if (verbose >= 2 && array_list->devname) - pr_err("%s doesn't have any identifying" - " information.\n", + pr_err("%s doesn't have any identifying information.\n", array_list->devname); continue; } @@ -1131,13 +1128,11 @@ struct mddev_ident *conf_match(struct supertype *st, if (match) { if (verbose >= 0) { if (match->devname && array_list->devname) - pr_err("we match both %s and %s - " - "cannot decide which to use.\n", + pr_err("we match both %s and %s - cannot decide which to use.\n", match->devname, array_list->devname); else - pr_err("multiple lines in mdadm.conf" - " match\n"); + pr_err("multiple lines in mdadm.conf match\n"); } if (rvp) *rvp = 2; @@ -1174,8 +1169,7 @@ int conf_verify_devnames(struct mddev_ident *array_list) "%s have the same name: %s\n", nbuf, a1->devname); } else - pr_err("Device %s given twice" - " in config file\n", a1->devname); + pr_err("Device %s given twice in config file\n", a1->devname); return 1; } } -- cgit v1.2.3