From: Adam Kwolek Date: Wed, 15 Dec 2010 09:38:15 +0000 (+0100) Subject: imsm: FIX: imsm_add_spare() wrongly tests spares list X-Git-Tag: mdadm-3.2~182 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c932028981f82b69044214623d5175ebd06d8fa;p=thirdparty%2Fmdadm.git imsm: FIX: imsm_add_spare() wrongly tests spares list For more than one disk tested additional_test_list was searched from last point, not from begin. This bug causes that more than 2 disks cannot be added to imsm array, when imsm_add_spare() is used for this. Signed-off-by: Adam Kwolek Signed-off-by: NeilBrown --- diff --git a/super-intel.c b/super-intel.c index 2a23f1b4..2be24a9e 100644 --- a/super-intel.c +++ b/super-intel.c @@ -5034,6 +5034,7 @@ static struct dl *imsm_add_spare(struct intel_super *super, int slot, __u32 array_start = 0; __u32 array_end = 0; struct dl *dl; + struct mdinfo *test_list; for (dl = super->disks; dl; dl = dl->next) { /* If in this array, skip */ @@ -5047,16 +5048,17 @@ static struct dl *imsm_add_spare(struct intel_super *super, int slot, } if (d) continue; - while (additional_test_list) { - if (additional_test_list->disk.major == dl->major && - additional_test_list->disk.minor == dl->minor) { + test_list = additional_test_list; + while (test_list) { + if (test_list->disk.major == dl->major && + test_list->disk.minor == dl->minor) { dprintf("%x:%x already in additional test list\n", dl->major, dl->minor); break; } - additional_test_list = additional_test_list->next; + test_list = test_list->next; } - if (additional_test_list) + if (test_list) continue; /* skip in use or failed drives */