int fd;
if (!st->metadata ||
- !st->metadata->ss->min_acceptable_spare_size)
+ !st->metadata->ss->min_acceptable_spare_size) {
+ *sizep = 0;
return 0;
+ }
fd = open(st->devname, O_RDONLY);
if (fd < 0)
struct dev_policy *pol;
unsigned long long dev_size;
+ if (to->metadata->ss->external &&
+ test_partition_from_id(from->devid[d]))
+ continue;
+
if (min_size &&
dev_size_from_id(from->devid[d], &dev_size) &&
dev_size < min_size)
if (from->spare_group)
pol_add(&pol, pol_domain,
from->spare_group, NULL);
- if (domain_test(domlist, pol, to->metadata->ss->name))
+ if (domain_test(domlist, pol, to->metadata->ss->name) == 1)
dev = from->devid[d];
dev_policy_free(pol);
}
static dev_t container_choose_spare(struct state *from, struct state *to,
struct domainlist *domlist,
- unsigned long long min_size)
+ unsigned long long min_size, int active)
{
/* This is similar to choose_spare, but we cannot trust devstate,
* so we need to read the metadata instead
if (err)
return 0;
+ if (from == to) {
+ /* We must check if number of active disks has not increased
+ * since ioctl in main loop. mdmon may have added spare
+ * to subarray. If so we do not need to look for more spares
+ * so return non zero value */
+ int active_cnt = 0;
+ struct mdinfo *dp;
+ list = st->ss->getinfo_super_disks(st);
+ if (!list) {
+ st->ss->free_super(st);
+ return 1;
+ }
+ dp = list->devs;
+ while (dp) {
+ if (dp->disk.state & (1<<MD_DISK_SYNC) &&
+ !(dp->disk.state & (1<<MD_DISK_FAULTY)))
+ active_cnt++;
+ dp = dp->next;
+ }
+ sysfs_free(list);
+ if (active < active_cnt) {
+ /* Spare just activated.*/
+ st->ss->free_super(st);
+ return 1;
+ }
+ }
+
/* We only need one spare so full list not needed */
list = container_choose_spares(st, min_size, domlist, from->spare_group,
to->metadata->ss->name, 1);
* no suitable spare in container already.
* If there is we don't add more */
dev_t devid = container_choose_spare(
- to, to, NULL, min_size);
+ to, to, NULL, min_size, st->active);
if (devid > 0)
continue;
}
continue;
if (from->metadata->ss->external)
devid = container_choose_spare(
- from, to, domlist, min_size);
+ from, to, domlist, min_size, 0);
else
devid = choose_spare(from, to, domlist,
min_size);