linux/mdadm
1
0
Fork 0
Code Issues Activity

Merging upstream version 4.3.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-14 06:33:29 +01:00
parent 07b992239b
commit 0a7cc54657
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
13 changed files with 76 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

12
super1.c
View file

@ -645,10 +645,6 @@ static void brief_examine_super1(struct supertype *st, int verbose)
printf(":");
printf("%02x", sb->set_uuid[i]);
}
if (sb->set_name[0]) {
printf(" name=");
print_quoted(sb->set_name);
}
printf("\n");
}
@ -875,10 +871,6 @@ static void brief_detail_super1(struct supertype *st, char *subarray)
struct mdp_superblock_1 *sb = st->sb;
int i;
if (sb->set_name[0]) {
printf(" name=");
print_quoted(sb->set_name);
}
printf(" UUID=");
for (i = 0; i < 16; i++) {
if ((i & 3) == 0 && i != 0)
@ -1356,6 +1348,10 @@ static int update_super1(struct supertype *st, struct mdinfo *info,
__cpu_to_le16(info->disk.raid_disk);
break;
}
case UOPT_RESYNC:
/* make sure resync happens */
sb->resync_offset = 0;
break;
case UOPT_UUID:
copy_uuid(sb->set_uuid, info->uuid, super1.swapuuid);