9eeca8cc12
- DDF-compare_super_ddf-fix-sequence-number-check.patch - Monitor-don-t-set-arrays-dirty-after-transition-to-r.patch - DDF-add_to_super_ddf-be-careful-with-workspace_lba.patch - Monitor-write-meta-data-in-readonly-state-sometimes.patch - Assembe-fix-bug-in-force_array-it-wasn-t-forcing-pro.patch Various bugfixes from upstream - several to improve DDF support, one which fixes a nasty bug in "--assemble --force". - DDF-brief_examine_subarrays_ddf-print-array-name.patch DDF-factor-out-array-name-generation.patch Include name in "-Db" output for DDF FATE#316007 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=96
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
From 7039479987745f19b166b1c28d45dfc41420e6d9 Mon Sep 17 00:00:00 2001
|
|
From: "mwilck@arcor.de" <mwilck@arcor.de>
|
|
Date: Sat, 14 Sep 2013 22:47:12 +0200
|
|
Subject: [PATCH] DDF: compare_super_ddf: fix sequence number check
|
|
|
|
The sequence number check in compare_super_ddf was broken,
|
|
anchor sequence number is always -1.
|
|
|
|
With this patch, mdadm will refuse to add a disk with non-matching
|
|
sequence number.
|
|
|
|
This fixes Francis Moreau's problem reported with subject
|
|
"mdadm 3.3 fails to kick out non fresh disk".
|
|
|
|
FIXME: More work is needed here. Currently mdadm won't even add the
|
|
disk to the container, that's wrong. It should be added as a spare.
|
|
|
|
Signed-off-by: NeilBrown <neilb@suse.de>
|
|
---
|
|
super-ddf.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- mdadm-3.3.orig/super-ddf.c
|
|
+++ mdadm-3.3/super-ddf.c
|
|
@@ -3893,10 +3893,10 @@ static int compare_super_ddf(struct supe
|
|
if (memcmp(first->anchor.guid, second->anchor.guid, DDF_GUID_LEN) != 0)
|
|
return 2;
|
|
|
|
- if (!be32_eq(first->anchor.seq, second->anchor.seq)) {
|
|
- dprintf("%s: sequence number mismatch %u/%u\n", __func__,
|
|
- be32_to_cpu(first->anchor.seq),
|
|
- be32_to_cpu(second->anchor.seq));
|
|
+ if (!be32_eq(first->active->seq, second->active->seq)) {
|
|
+ dprintf("%s: sequence number mismatch %u<->%u\n", __func__,
|
|
+ be32_to_cpu(first->active->seq),
|
|
+ be32_to_cpu(second->active->seq));
|
|
return 3;
|
|
}
|
|
if (first->max_part != second->max_part ||
|