* but may not wrap over lines
*
*/
+#ifndef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 200809L
+#endif
#ifndef CONFFILE
#define CONFFILE "/etc/mdadm.conf"
#define CONFFILE2 "/etc/mdadm/mdadm.conf"
#endif
char DefaultConfFile[] = CONFFILE;
+char DefaultConfDir[] = CONFFILE ".d";
char DefaultAltConfFile[] = CONFFILE2;
+char DefaultAltConfDir[] = CONFFILE2 ".d";
enum linetype { Devices, Array, Mailaddr, Mailfrom, Program, CreateDev,
- Homehost, AutoMode, Policy, PartPolicy, LTEnd };
+ Homehost, HomeCluster, AutoMode, Policy, PartPolicy, LTEnd };
char *keywords[] = {
[Devices] = "devices",
[Array] = "array",
[Program] = "program",
[CreateDev]= "create",
[Homehost] = "homehost",
+ [HomeCluster] = "homecluster",
[AutoMode] = "auto",
[Policy] = "policy",
[PartPolicy]="part-policy",
int len = strlen(word);
int n;
- if (len < 3) return -1;
- for (n=0; keywords[n]; n++) {
- if (strncasecmp(word, keywords[n], len)==0)
+ if (len < 3)
+ return -1;
+ for (n = 0; keywords[n]; n++) {
+ if (strncasecmp(word, keywords[n], len) == 0)
return n;
}
+
return -1;
}
FILE *f = fopen("/proc/partitions", "r");
char buf[1024];
struct mddev_dev *rv = NULL;
+
if (f == NULL) {
pr_err("cannot open /proc/partitions\n");
return NULL;
name = map_dev(major, minor, 1);
if (!name)
continue;
- d = xmalloc(sizeof(*d));
- memset(d, 0, sizeof(*d));
+ d = xcalloc(1, sizeof(*d));
d->devname = xstrdup(name);
d->next = rv;
rv = d;
struct mddev_dev *load_containers(void)
{
- struct mdstat_ent *mdstat = mdstat_read(1, 0);
+ struct mdstat_ent *mdstat = mdstat_read(0, 0);
struct mdstat_ent *ent;
struct mddev_dev *d;
struct mddev_dev *rv = NULL;
+ struct map_ent *map = NULL, *me;
if (!mdstat)
return NULL;
if (ent->metadata_version &&
strncmp(ent->metadata_version, "external:", 9) == 0 &&
!is_subarray(&ent->metadata_version[9])) {
- d = xmalloc(sizeof(*d));
- memset(d, 0, sizeof(*d));
- if (asprintf(&d->devname, "/dev/%s", ent->dev) < 0) {
+ d = xcalloc(1, sizeof(*d));
+ me = map_by_devnm(&map, ent->devnm);
+ if (me)
+ d->devname = xstrdup(me->path);
+ else if (asprintf(&d->devname, "/dev/%s", ent->devnm) < 0) {
free(d);
continue;
}
rv = d;
}
free_mdstat(mdstat);
+ map_free(map);
return rv;
}
.autof = 2, /* by default, create devices with standard names */
.symlinks = 1,
.names = 0, /* By default, stick with numbered md devices. */
+ .bblist = 1, /* Use a bad block list by default */
#ifdef DEBIAN
.gid = 6, /* disk */
.mode = 0660,
int autof;
if (str == NULL || *str == 0)
autof = 2;
- else if (strcasecmp(str,"no")==0)
+ else if (strcasecmp(str, "no") == 0)
autof = 1;
- else if (strcasecmp(str,"yes")==0)
+ else if (strcasecmp(str, "yes") == 0)
autof = 2;
- else if (strcasecmp(str,"md")==0)
- autof = config?5:3;
+ else if (strcasecmp(str, "md") == 0)
+ autof = config ? 5:3;
else {
/* There might be digits, and maybe a hypen, at the end */
char *e = str + strlen(str);
e--;
if (*e) {
num = atoi(e);
- if (num <= 0) num = 1;
+ if (num <= 0)
+ num = 1;
}
if (e > str && e[-1] == '-')
e--;
len = e - str;
- if ((len == 2 && strncasecmp(str,"md",2)==0)) {
+ if ((len == 2 && strncasecmp(str, "md", 2) == 0)) {
autof = config ? 5 : 3;
- } else if ((len == 3 && strncasecmp(str,"yes",3)==0)) {
+ } else if ((len == 3 && strncasecmp(str, "yes", 3) == 0)) {
autof = 2;
- } else if ((len == 3 && strncasecmp(str,"mdp",3)==0)) {
+ } else if ((len == 3 && strncasecmp(str, "mdp", 3) == 0)) {
autof = config ? 6 : 4;
- } else if ((len == 1 && strncasecmp(str,"p",1)==0) ||
- (len >= 4 && strncasecmp(str,"part",4)==0)) {
+ } else if ((len == 1 && strncasecmp(str, "p", 1) == 0) ||
+ (len >= 4 && strncasecmp(str, "part", 4) == 0)) {
autof = 6;
} else {
pr_err("%s arg of \"%s\" unrecognised: use no,yes,md,mdp,part\n"
char *w;
char *ep;
- for (w=dl_next(line); w!=line; w=dl_next(w)) {
+ for (w = dl_next(line); w != line; w = dl_next(w)) {
if (strncasecmp(w, "auto=", 5) == 0)
- createinfo.autof = parse_auto(w+5, "auto=", 1);
+ createinfo.autof = parse_auto(w + 5, "auto=", 1);
else if (strncasecmp(w, "owner=", 6) == 0) {
if (w[6] == 0) {
pr_err("missing owner name\n");
continue;
}
- createinfo.uid = strtoul(w+6, &ep, 10);
+ createinfo.uid = strtoul(w + 6, &ep, 10);
if (*ep != 0) {
struct passwd *pw;
/* must be a name */
- pw = getpwnam(w+6);
+ pw = getpwnam(w + 6);
if (pw)
createinfo.uid = pw->pw_uid;
else
- pr_err("CREATE user %s not found\n", w+6);
+ pr_err("CREATE user %s not found\n",
+ w + 6);
}
} else if (strncasecmp(w, "group=", 6) == 0) {
if (w[6] == 0) {
pr_err("missing group name\n");
continue;
}
- createinfo.gid = strtoul(w+6, &ep, 10);
+ createinfo.gid = strtoul(w + 6, &ep, 10);
if (*ep != 0) {
struct group *gr;
/* must be a name */
- gr = getgrnam(w+6);
+ gr = getgrnam(w + 6);
if (gr)
createinfo.gid = gr->gr_gid;
else
- pr_err("CREATE group %s not found\n", w+6);
+ pr_err("CREATE group %s not found\n",
+ w + 6);
}
} else if (strncasecmp(w, "mode=", 5) == 0) {
if (w[5] == 0) {
pr_err("missing CREATE mode\n");
continue;
}
- createinfo.mode = strtoul(w+5, &ep, 8);
+ createinfo.mode = strtoul(w + 5, &ep, 8);
if (*ep != 0) {
createinfo.mode = 0600;
pr_err("unrecognised CREATE mode %s\n",
- w+5);
+ w + 5);
}
} else if (strncasecmp(w, "metadata=", 9) == 0) {
/* style of metadata to use by default */
int i;
- for (i=0; superlist[i] && !createinfo.supertype; i++)
- createinfo.supertype =
- superlist[i]->match_metadata_desc(w+9);
+ for (i = 0; superlist[i] && !createinfo.supertype; i++)
+ createinfo.supertype = superlist[i]->match_metadata_desc(w + 9);
if (!createinfo.supertype)
pr_err("metadata format %s unknown, ignoring\n",
w+9);
createinfo.names = 1;
else if (strncasecmp(w, "names=no", 11) == 0)
createinfo.names = 0;
+ else if (strncasecmp(w, "bbl=no", 11) == 0)
+ createinfo.bblist = 0;
+ else if (strncasecmp(w, "bbl=yes", 11) == 0)
+ createinfo.bblist = 1;
else {
pr_err("unrecognised word on CREATE line: %s\n",
w);
char *w;
struct conf_dev *cd;
- for (w=dl_next(line); w != line; w=dl_next(w)) {
+ for (w = dl_next(line); w != line; w = dl_next(w)) {
if (w[0] == '/' || strcasecmp(w, "partitions") == 0 ||
strcasecmp(w, "containers") == 0) {
cd = xmalloc(sizeof(*cd));
cd->next = cdevlist;
cdevlist = cd;
} else {
- pr_err("unreconised word on DEVICE line: %s\n",
- w);
+ pr_err("unreconised word on DEVICE line: %s\n", w);
}
}
}
mis.container = NULL;
mis.member = NULL;
- for (w=dl_next(line); w!=line; w=dl_next(w)) {
+ for (w = dl_next(line); w != line; w = dl_next(w)) {
if (w[0] == '/' || strchr(w, '=') == NULL) {
/* This names the device, or is '<ignore>'.
* The rules match those in create_mddev.
strncmp(w, "/dev/md/", 8) == 0 ||
(w[0] != '/' && w[0] != '<') ||
(strncmp(w, "/dev/md", 7) == 0 &&
- is_number(w+7)) ||
+ is_number(w + 7)) ||
(strncmp(w, "/dev/md_d", 9) == 0 &&
- is_number(w+9))
- ) {
+ is_number(w + 9))) {
/* 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 ) {
+ } else if (strncasecmp(w, "uuid=", 5) == 0) {
if (mis.uuid_set)
pr_err("only specify uuid once, %s ignored.\n",
- w);
+ w);
else {
- if (parse_uuid(w+5, mis.uuid))
+ if (parse_uuid(w + 5, mis.uuid))
mis.uuid_set = 1;
else
pr_err("bad uuid: %s\n", w);
}
- } else if (strncasecmp(w, "super-minor=", 12)==0 ) {
+ } else if (strncasecmp(w, "super-minor=", 12) == 0) {
if (mis.super_minor != UnSet)
pr_err("only specify super-minor once, %s ignored.\n",
w);
else {
char *endptr;
- int minor = strtol(w+12, &endptr, 10);
+ int minor = strtol(w + 12, &endptr, 10);
- if (w[12]==0 || endptr[0]!=0 || minor < 0)
+ if (w[12] == 0 || endptr[0] != 0 || minor < 0)
pr_err("invalid super-minor number: %s\n",
- w);
+ w);
else
mis.super_minor = minor;
}
- } else if (strncasecmp(w, "name=", 5)==0) {
+ } else if (strncasecmp(w, "name=", 5) == 0) {
if (mis.name[0])
pr_err("only specify name once, %s ignored.\n",
w);
- else if (strlen(w+5) > 32)
+ else if (strlen(w + 5) > 32)
pr_err("name too long, ignoring %s\n", w);
else
- strcpy(mis.name, w+5);
+ strcpy(mis.name, w + 5);
} else if (strncasecmp(w, "bitmap=", 7) == 0) {
if (mis.bitmap_file)
pr_err("only specify bitmap file once. %s ignored\n",
w);
else
- mis.bitmap_file = xstrdup(w+7);
+ mis.bitmap_file = xstrdup(w + 7);
- } else if (strncasecmp(w, "devices=", 8 ) == 0 ) {
+ } else if (strncasecmp(w, "devices=", 8 ) == 0) {
if (mis.devices)
pr_err("only specify devices once (use a comma separated list). %s ignored\n",
w);
else
- mis.devices = xstrdup(w+8);
- } else if (strncasecmp(w, "spare-group=", 12) == 0 ) {
+ mis.devices = xstrdup(w + 8);
+ } else if (strncasecmp(w, "spare-group=", 12) == 0) {
if (mis.spare_group)
pr_err("only specify one spare group per array. %s ignored.\n",
w);
else
- mis.spare_group = xstrdup(w+12);
+ mis.spare_group = xstrdup(w + 12);
} else if (strncasecmp(w, "level=", 6) == 0 ) {
/* this is mainly for compatability with --brief output */
- mis.level = map_name(pers, w+6);
- } else if (strncasecmp(w, "disks=", 6) == 0 ) {
+ mis.level = map_name(pers, w + 6);
+ } else if (strncasecmp(w, "disks=", 6) == 0) {
/* again, for compat */
- mis.raid_disks = atoi(w+6);
- } else if (strncasecmp(w, "num-devices=", 12) == 0 ) {
+ mis.raid_disks = atoi(w + 6);
+ } else if (strncasecmp(w, "num-devices=", 12) == 0) {
/* again, for compat */
- mis.raid_disks = atoi(w+12);
- } else if (strncasecmp(w, "spares=", 7) == 0 ) {
+ mis.raid_disks = atoi(w + 12);
+ } else if (strncasecmp(w, "spares=", 7) == 0) {
/* for warning if not all spares present */
- mis.spare_disks = atoi(w+7);
+ mis.spare_disks = atoi(w + 7);
} else if (strncasecmp(w, "metadata=", 9) == 0) {
/* style of metadata on the devices. */
int i;
for(i=0; superlist[i] && !mis.st; i++)
- mis.st = superlist[i]->match_metadata_desc(w+9);
+ mis.st = superlist[i]->
+ match_metadata_desc(w + 9);
if (!mis.st)
- pr_err("metadata format %s unknown, ignored.\n", w+9);
+ pr_err("metadata format %s unknown, ignored.\n",
+ w + 9);
} else if (strncasecmp(w, "auto=", 5) == 0 ) {
/* whether to create device special files as needed */
- mis.autof = parse_auto(w+5, "auto type", 0);
+ mis.autof = parse_auto(w + 5, "auto type", 0);
} else if (strncasecmp(w, "member=", 7) == 0) {
/* subarray within a container */
- mis.member = xstrdup(w+7);
+ mis.member = xstrdup(w + 7);
} else if (strncasecmp(w, "container=", 10) == 0) {
- /* the container holding this subarray. Either a device name
- * or a uuid */
- mis.container = xstrdup(w+10);
+ /* The container holding this subarray.
+ * Either a device name or a uuid */
+ mis.container = xstrdup(w + 10);
} else {
pr_err("unrecognised word on ARRAY line: %s\n",
w);
if (mis.uuid_set == 0 && mis.devices == NULL &&
mis.super_minor == UnSet && mis.name[0] == 0 &&
(mis.container == NULL || mis.member == NULL))
- pr_err("ARRAY line %s has no identity information.\n", mis.devname);
+ pr_err("ARRAY line %s has no identity information.\n",
+ mis.devname);
else {
mi = xmalloc(sizeof(*mi));
*mi = mis;
{
char *w;
- for (w=dl_next(line); w != line ; w=dl_next(w)) {
+ for (w = dl_next(line); w != line; w = dl_next(w))
if (alert_email == NULL)
alert_email = xstrdup(w);
- else
- pr_err("excess address on MAIL line: %s - ignored\n",
- w);
- }
}
static char *alert_mail_from = NULL;
{
char *w;
- for (w=dl_next(line); w != line ; w=dl_next(w)) {
+ for (w = dl_next(line); w != line; w = dl_next(w)) {
if (alert_mail_from == NULL)
alert_mail_from = xstrdup(w);
else {
{
char *w;
- for (w=dl_next(line); w != line ; w=dl_next(w)) {
+ for (w = dl_next(line); w != line; w = dl_next(w))
if (alert_program == NULL)
alert_program = xstrdup(w);
- else
- pr_err("excess program on PROGRAM line: %s - ignored\n",
- w);
- }
}
static char *home_host = NULL;
{
char *w;
- for (w=dl_next(line); w != line ; w=dl_next(w)) {
- if (strcasecmp(w, "<ignore>")==0)
+ for (w = dl_next(line); w != line; w = dl_next(w)) {
+ if (strcasecmp(w, "<ignore>") == 0)
require_homehost = 0;
else if (home_host == NULL) {
- if (strcasecmp(w, "<none>")==0)
+ if (strcasecmp(w, "<none>") == 0)
home_host = xstrdup("");
else
home_host = xstrdup(w);
- }else
- pr_err("excess host name on HOMEHOST line: %s - ignored\n",
- w);
+ }
+ }
+}
+
+static char *home_cluster = NULL;
+void homeclusterline(char *line)
+{
+ char *w;
+
+ for (w = dl_next(line); w != line; w = dl_next(w)) {
+ if (home_cluster == NULL) {
+ if (strcasecmp(w, "<none>") == 0)
+ home_cluster = xstrdup("");
+ else
+ home_cluster = xstrdup(w);
+ }
}
}
int homehost = 0;
int i;
- if (auto_seen) {
- pr_err("AUTO line may only be give once."
- " Subsequent lines ignored\n");
+ if (auto_seen)
return;
- }
- /* Parse the 'auto' line creating policy statements for the 'auto' policy.
+ auto_seen = 1;
+
+ /*
+ * Parse the 'auto' line creating policy statements for the 'auto'
+ * policy.
*
* The default is 'yes' but the 'auto' line might over-ride that.
* Words in the line are processed in order with the first
* been seen gets an appropriate auto= entry.
*/
+ /*
+ * If environment variable MDADM_CONF_AUTO is defined, then
+ * it is prepended to the auto line. This allow a script
+ * to easily disable some metadata types.
+ */
+ w = getenv("MDADM_CONF_AUTO");
+ if (w && *w) {
+ char *l = xstrdup(w);
+ char *head = line;
+ w = strtok(l, " \t");
+ while (w) {
+ char *nw = dl_strdup(w);
+ dl_insert(head, nw);
+ head = nw;
+ w = strtok(NULL, " \t");
+ }
+ free(l);
+ }
+
for (super_cnt = 0; superlist[super_cnt]; super_cnt++)
;
seen = xcalloc(super_cnt, 1);
- for (w = dl_next(line); w != line ; w = dl_next(w)) {
+ for (w = dl_next(line); w != line; w = dl_next(w)) {
char *val;
if (strcasecmp(w, "yes") == 0) {
} else
continue;
- if (strcasecmp(w+1, "all") == 0) {
+ if (strcasecmp(w + 1, "all") == 0) {
dflt = val;
break;
}
for (i = 0; superlist[i]; i++) {
const char *version = superlist[i]->name;
- if (strcasecmp(w+1, version) == 0)
+ if (strcasecmp(w + 1, version) == 0)
break;
/* 1 matches 1.x, 0 matches 0.90 */
- if (version[1] == '.' &&
- strlen(w+1) == 1 &&
+ if (version[1] == '.' && strlen(w + 1) == 1 &&
w[1] == version[0])
break;
/* 1.anything matches 1.x */
if (strcmp(version, "1.x") == 0 &&
- strncmp(w+1, "1.", 2) == 0)
+ strncmp(w + 1, "1.", 2) == 0)
break;
}
if (superlist[i] == NULL)
if (seen[i])
/* already know about this metadata */
continue;
- policy_add(rule_policy, pol_auto, val, pol_metadata, superlist[i]->name, NULL);
+ policy_add(rule_policy, pol_auto, val, pol_metadata,
+ superlist[i]->name, NULL);
seen[i] = 1;
}
for (i = 0; i < super_cnt; i++)
if (!seen[i])
- policy_add(rule_policy, pol_auto, dflt, pol_metadata, superlist[i]->name, NULL);
+ policy_add(rule_policy, pol_auto, dflt, pol_metadata,
+ superlist[i]->name, NULL);
free(seen);
}
conffile = file;
}
-void load_conffile(void)
+void conf_file(FILE *f)
{
- FILE *f;
char *line;
-
- if (loaded) return;
- if (conffile == NULL)
- conffile = DefaultConfFile;
-
- if (strcmp(conffile, "none") == 0) {
- loaded = 1;
- return;
- }
- if (strcmp(conffile, "partitions")==0) {
- char *list = dl_strdup("DEV");
- dl_init(list);
- dl_add(list, dl_strdup("partitions"));
- devline(list);
- free_line(list);
- loaded = 1;
- return;
- }
- f = fopen(conffile, "r");
- /* Debian chose to relocate mdadm.conf into /etc/mdadm/.
- * To allow Debian users to compile from clean source and still
- * have a working mdadm, we read /etc/mdadm/mdadm.conf
- * if /etc/mdadm.conf doesn't exist
- */
- if (f == NULL &&
- conffile == DefaultConfFile) {
- f = fopen(DefaultAltConfFile, "r");
- if (f)
- conffile = DefaultAltConfFile;
- }
- if (f == NULL)
- return;
-
- loaded = 1;
- while ((line=conf_line(f))) {
+ while ((line = conf_line(f))) {
switch(match_keyword(line)) {
case Devices:
devline(line);
case Homehost:
homehostline(line);
break;
+ case HomeCluster:
+ homeclusterline(line);
+ break;
case AutoMode:
autoline(line);
break;
}
free_line(line);
}
+}
- fclose(f);
+struct fname {
+ struct fname *next;
+ char name[];
+};
+
+void conf_file_or_dir(FILE *f)
+{
+ struct stat st;
+ DIR *dir;
+ struct dirent *dp;
+ struct fname *list = NULL;
+
+ fstat(fileno(f), &st);
+ if (S_ISREG(st.st_mode))
+ conf_file(f);
+ else if (!S_ISDIR(st.st_mode))
+ return;
+#if _XOPEN_SOURCE >= 700 || _POSIX_C_SOURCE >= 200809L
+ dir = fdopendir(fileno(f));
+ if (!dir)
+ return;
+ while ((dp = readdir(dir)) != NULL) {
+ int l;
+ struct fname *fn, **p;
+ if (dp->d_ino == 0)
+ continue;
+ if (dp->d_name[0] == '.')
+ continue;
+ l = strlen(dp->d_name);
+ if (l < 6 || strcmp(dp->d_name + l - 5, ".conf") != 0)
+ continue;
+ fn = xmalloc(sizeof(*fn) + l + 1);
+ strcpy(fn->name, dp->d_name);
+ for (p = &list;
+ *p && strcmp((*p)->name, fn->name) < 0;
+ p = & (*p)->next)
+ ;
+ fn->next = *p;
+ *p = fn;
+ }
+ while (list) {
+ int fd;
+ FILE *f2;
+ struct fname *fn = list;
+ list = list->next;
+ fd = openat(fileno(f), fn->name, O_RDONLY);
+ free(fn);
+ if (fd < 0)
+ continue;
+ f2 = fdopen(fd, "r");
+ if (!f2) {
+ close(fd);
+ continue;
+ }
+ conf_file(f2);
+ fclose(f2);
+ }
+ closedir(dir);
+#endif
+}
+
+void load_conffile(void)
+{
+ FILE *f;
+ char *confdir = NULL;
+ char *head;
+
+ if (loaded)
+ return;
+ if (conffile == NULL) {
+ conffile = DefaultConfFile;
+ confdir = DefaultConfDir;
+ }
+
+ if (strcmp(conffile, "partitions") == 0) {
+ char *list = dl_strdup("DEV");
+ dl_init(list);
+ dl_add(list, dl_strdup("partitions"));
+ devline(list);
+ free_line(list);
+ } else if (strcmp(conffile, "none") != 0) {
+ f = fopen(conffile, "r");
+ /* Debian chose to relocate mdadm.conf into /etc/mdadm/.
+ * To allow Debian users to compile from clean source and still
+ * have a working mdadm, we read /etc/mdadm/mdadm.conf
+ * if /etc/mdadm.conf doesn't exist
+ */
+ if (f == NULL && conffile == DefaultConfFile) {
+ f = fopen(DefaultAltConfFile, "r");
+ if (f) {
+ conffile = DefaultAltConfFile;
+ confdir = DefaultAltConfDir;
+ }
+ }
+ if (f) {
+ conf_file_or_dir(f);
+ fclose(f);
+ }
+ if (confdir) {
+ f = fopen(confdir, "r");
+ if (f) {
+ conf_file_or_dir(f);
+ fclose(f);
+ }
+ }
+ }
+ /* If there was no AUTO line, process an empty line
+ * now so that the MDADM_CONF_AUTO env var gets processed.
+ */
+ head = dl_strdup("AUTO");
+ dl_init(head);
+ autoline(head);
+ free_line(head);
-/* printf("got file\n"); */
+ loaded = 1;
}
char *conf_get_mailaddr(void)
return home_host;
}
+char *conf_get_homecluster(void)
+{
+ load_conffile();
+ return home_cluster;
+}
+
struct createinfo *conf_get_create_info(void)
{
load_conffile();
struct mddev_ident *rv;
load_conffile();
rv = mddevlist;
- while (dev && rv && (rv->devname == NULL
- || !devname_matches(dev, rv->devname)))
+ while (dev && rv && (rv->devname == NULL ||
+ !devname_matches(dev, rv->devname)))
rv = rv->next;
return rv;
}
append_dlist(&dlist, load_containers());
}
- for (cd=cdevlist; cd; cd=cd->next) {
- if (strcasecmp(cd->name, "partitions")==0)
+ for (cd = cdevlist; cd; cd = cd->next) {
+ if (strcasecmp(cd->name, "partitions") == 0)
append_dlist(&dlist, load_partitions());
- else if (strcasecmp(cd->name, "containers")==0)
+ else if (strcasecmp(cd->name, "containers") == 0)
append_dlist(&dlist, load_containers());
else {
glob(cd->name, flags, NULL, &globbuf);
}
}
if (flags & GLOB_APPEND) {
- for (i=0; i<globbuf.gl_pathc; i++) {
- struct mddev_dev *t = xmalloc(sizeof(*t));
- memset(t, 0, sizeof(*t));
+ for (i = 0; i < globbuf.gl_pathc; i++) {
+ struct mddev_dev *t;
+ t = xcalloc(1, sizeof(*t));
t->devname = xstrdup(globbuf.gl_pathv[i]);
t->next = dlist;
dlist = t;
if (cdevlist == NULL)
/* allow anything by default */
return 1;
- for (cd = cdevlist ; cd ; cd = cd->next) {
+ for (cd = cdevlist; cd; cd = cd->next) {
if (strcasecmp(cd->name, "partitions") == 0)
return 1;
if (fnmatch(cd->name, devname, FNM_PATHNAME) == 0)
* else 'yes'.
*/
struct dev_policy *p;
- int no=0, found_homehost=0;
+ int no = 0, found_homehost = 0;
load_conffile();
pol = pol_find(pol, pol_auto);
if (!devices)
devices = p + strlen(p);
if (devices-p < 1024) {
- strncpy(patn, p, devices-p);
+ strncpy(patn, p, devices - p);
patn[devices-p] = 0;
- if (fnmatch(patn, devname, FNM_PATHNAME)==0)
+ if (fnmatch(patn, devname, FNM_PATHNAME) == 0)
return 1;
}
if (*devices == ',')
else if (strncmp(match, "/dev/", 5) == 0)
match += 5;
- if (strncmp(name, "md", 2) == 0 &&
- isdigit(name[2]))
+ if (strncmp(name, "md", 2) == 0 && isdigit(name[2]))
name += 2;
- if (strncmp(match, "md", 2) == 0 &&
- isdigit(match[2]))
+ if (strncmp(match, "md", 2) == 0 && isdigit(match[2]))
match += 2;
return (strcmp(name, match) == 0);
if (dev->name[0] && devname_matches(name, dev->name))
return 0;
sprintf(nbuf, "%d", dev->super_minor);
- if (dev->super_minor != UnSet &&
- devname_matches(name, nbuf))
+ if (dev->super_minor != UnSet && devname_matches(name, nbuf))
return 0;
}
return 1;
match = NULL;
for (; array_list; array_list = array_list->next) {
if (array_list->uuid_set &&
- same_uuid(array_list->uuid, info->uuid, st->ss->swapuuid)
- == 0) {
+ same_uuid(array_list->uuid, info->uuid,
+ st->ss->swapuuid) == 0) {
if (verbose >= 2 && array_list->devname)
pr_err("UUID differs from %s.\n",
array_list->devname);
array_list->devname);
continue;
}
- if (!array_list->uuid_set &&
- !array_list->name[0] &&
- !array_list->devices &&
- array_list->super_minor == UnSet) {
+ if (!array_list->uuid_set && !array_list->name[0] &&
+ !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;
}
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;
"%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;
}
}
projects / thirdparty / mdadm.git / blobdiff