Merging upstream version 4.2+20231026.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
bb079da599
commit
a701b01644
30 changed files with 956 additions and 423 deletions
12
Assemble.c
12
Assemble.c
|
@ -428,8 +428,6 @@ static int select_devices(struct mddev_dev *devlist,
|
|||
|
||||
/* make sure we finished the loop */
|
||||
tmpdev = NULL;
|
||||
free(st);
|
||||
st = NULL;
|
||||
goto loop;
|
||||
} else {
|
||||
content = *contentp;
|
||||
|
@ -1992,12 +1990,10 @@ int assemble_container_content(struct supertype *st, int mdfd,
|
|||
return 1;
|
||||
}
|
||||
|
||||
if (strcmp(sra->text_version, content->text_version) != 0) {
|
||||
if (content->array.major_version == -1 &&
|
||||
content->array.minor_version == -2 &&
|
||||
c->readonly &&
|
||||
content->text_version[0] == '/')
|
||||
content->text_version[0] = '-';
|
||||
/* Fill sysfs properties only if they are not set. Determine it by checking text_version
|
||||
* and ignoring special character on the first place.
|
||||
*/
|
||||
if (strcmp(sra->text_version + 1, content->text_version + 1) != 0) {
|
||||
if (sysfs_set_array(content, 9003) != 0) {
|
||||
sysfs_free(sra);
|
||||
return 1;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue