Merging upstream version 4.3+20240412.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
8e1e76d6e6
commit
9a795ca236
67 changed files with 2247 additions and 2747 deletions
16
super1.c
16
super1.c
|
@ -575,17 +575,6 @@ static void examine_super1(struct supertype *st, char *homehost)
|
|||
inconsistent = 1;
|
||||
}
|
||||
}
|
||||
#if 0
|
||||
/* This is confusing too */
|
||||
faulty = 0;
|
||||
for (i = 0; i < __le32_to_cpu(sb->max_dev); i++) {
|
||||
int role = __le16_to_cpu(sb->dev_roles[i]);
|
||||
if (role == MD_DISK_ROLE_FAULTY)
|
||||
faulty++;
|
||||
}
|
||||
if (faulty)
|
||||
printf(" %d failed", faulty);
|
||||
#endif
|
||||
printf(" ('A' == active, '.' == missing, 'R' == replacing)");
|
||||
printf("\n");
|
||||
for (d = 0; d < __le32_to_cpu(sb->max_dev); d++) {
|
||||
|
@ -1752,7 +1741,10 @@ static int add_to_super1(struct supertype *st, mdu_disk_info_t *dk,
|
|||
di->devname = devname;
|
||||
di->disk = *dk;
|
||||
di->data_offset = data_offset;
|
||||
get_dev_size(fd, NULL, &di->dev_size);
|
||||
|
||||
if (is_fd_valid(fd))
|
||||
get_dev_size(fd, NULL, &di->dev_size);
|
||||
|
||||
di->next = NULL;
|
||||
*dip = di;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue