linux/mdadm
1
0
Fork 0
Code Issues Activity

Merging upstream version 4.2+20230227.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-14 06:03:20 +01:00
parent 58a85b45ad
commit cd74b52c0d
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mapfile.c
View file

@ -292,6 +292,10 @@ struct map_ent *map_by_uuid(struct map_ent **map, int uuid[4])
struct map_ent *map_by_devnm(struct map_ent **map, char *devnm)
{
struct map_ent *mp;
if (!devnm)
return NULL;
if (!*map)
map_read(map);

7
util.c
View file

@ -1160,6 +1160,11 @@ struct supertype *super_by_fd(int fd, char **subarrayp)
int i;
char *subarray = NULL;
char container[32] = "";
char *devnm = NULL;
devnm = fd2devnm(fd);
if (!devnm)
return NULL;
sra = sysfs_read(fd, NULL, GET_VERSION);
@ -1205,7 +1210,7 @@ struct supertype *super_by_fd(int fd, char **subarrayp)
if (subarrayp)
*subarrayp = subarray;
strcpy(st->container_devnm, container);
strcpy(st->devnm, fd2devnm(fd));
strncpy(st->devnm, devnm, MD_NAME_MAX - 1);
} else
free(subarray);