Merging upstream version 4.2+20240118.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
ca87d3e0c7
commit
e23dbbb353
29 changed files with 158 additions and 229 deletions
2
util.c
2
util.c
|
@ -1852,7 +1852,7 @@ int remove_disk(int mdfd, struct supertype *st,
|
|||
|
||||
/* Remove the disk given by 'info' from the array */
|
||||
if (st->ss->external)
|
||||
rv = sysfs_set_str(sra, info, "slot", "none");
|
||||
rv = sysfs_set_str(sra, info, "slot", STR_COMMON_NONE);
|
||||
else
|
||||
rv = ioctl(mdfd, HOT_REMOVE_DISK, makedev(info->disk.major,
|
||||
info->disk.minor));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue