From b959dcfcd0319d4311e67fa40ebb407605efc9d9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 12 May 2023 14:47:09 +0200 Subject: Merging upstream version 4.2+20230508. Signed-off-by: Daniel Baumann --- mapfile.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mapfile.c') diff --git a/mapfile.c b/mapfile.c index ac35176..34fea17 100644 --- a/mapfile.c +++ b/mapfile.c @@ -320,9 +320,9 @@ struct map_ent *map_by_name(struct map_ent **map, char *name) for (mp = *map ; mp ; mp = mp->next) { if (!mp->path) continue; - if (strncmp(mp->path, "/dev/md/", 8) != 0) + if (strncmp(mp->path, DEV_MD_DIR, DEV_MD_DIR_LEN) != 0) continue; - if (strcmp(mp->path+8, name) != 0) + if (strcmp(mp->path + DEV_MD_DIR_LEN, name) != 0) continue; if (!mddev_busy(mp->devnm)) { mp->bad = 1; @@ -413,7 +413,7 @@ void RebuildMap(void) devid = devnm2devid(md->devnm); path = map_dev(major(devid), minor(devid), 0); if (path == NULL || - strncmp(path, "/dev/md/", 8) != 0) { + strncmp(path, DEV_MD_DIR, DEV_MD_DIR_LEN) != 0) { /* We would really like a name that provides * an MD_DEVNAME for udev. * The name needs to be unique both in /dev/md/ @@ -434,7 +434,7 @@ void RebuildMap(void) if (match && match->devname && match->devname[0] == '/') { path = match->devname; if (path[0] != '/') { - strcpy(namebuf, "/dev/md/"); + strcpy(namebuf, DEV_MD_DIR); strcat(namebuf, path); path = namebuf; } @@ -478,10 +478,10 @@ void RebuildMap(void) while (conflict) { if (unum >= 0) - sprintf(namebuf, "/dev/md/%s%s%d", + sprintf(namebuf, DEV_MD_DIR "%s%s%d", name, sep, unum); else - sprintf(namebuf, "/dev/md/%s", + sprintf(namebuf, DEV_MD_DIR "%s", name); unum++; if (lstat(namebuf, &stb) != 0 && -- cgit v1.2.3