diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-02-21 17:13:39 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-02-21 17:13:47 +0000 |
| commit | 84c33dd6d41c5b45288ca4059b781fe6fbd5bbad (patch) | |
| tree | e6cedad652076622be8aade2f08416975c7d84a4 /super1.c | |
| parent | Releasing debian version 4.2+20240118-1. (diff) | |
| download | mdadm-84c33dd6d41c5b45288ca4059b781fe6fbd5bbad.tar.xz mdadm-84c33dd6d41c5b45288ca4059b781fe6fbd5bbad.zip | |
Merging upstream version 4.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'super1.c')
| -rw-r--r-- | super1.c | 12 |
1 files changed, 4 insertions, 8 deletions
@@ -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); |