X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Incremental.c;fp=Incremental.c;h=b73eabd7f85babc7d71259ba774d3ef8a0a13f52;hb=74d293a2535ef8726a9d43577dad4a908f471a0e;hp=c00a43d66bfc8418fbd14d7c9dd3de5a3004777f;hpb=64ec81da7a70adcdc0dbccaacc69aaf90edb4011;p=thirdparty%2Fmdadm.git diff --git a/Incremental.c b/Incremental.c index c00a43d6..b73eabd7 100644 --- a/Incremental.c +++ b/Incremental.c @@ -802,27 +802,27 @@ static int count_active(struct supertype *st, struct mdinfo *sra, } /* test if container has degraded member(s) */ -static int container_members_max_degradation(struct map_ent *map, struct map_ent *me) +static int +container_members_max_degradation(struct map_ent *map, struct map_ent *me) { - mdu_array_info_t array; - int afd; - int max_degraded = 0; + struct mdinfo *sra; + int degraded, max_degraded = 0; for(; map; map = map->next) { if (!metadata_container_matches(map->metadata, me->devnm)) continue; - afd = open_dev(map->devnm); - if (afd < 0) - continue; /* most accurate information regarding array degradation */ - if (md_get_array_info(afd, &array) >= 0) { - int degraded = array.raid_disks - array.active_disks - - array.spare_disks; - if (degraded > max_degraded) - max_degraded = degraded; - } - close(afd); + sra = sysfs_read(-1, map->devnm, + GET_DISKS | GET_DEVS | GET_STATE); + if (!sra) + continue; + degraded = sra->array.raid_disks - sra->array.active_disks - + sra->array.spare_disks; + if (degraded > max_degraded) + max_degraded = degraded; + sysfs_free(sra); } + return max_degraded; }