Incremental: Use md_array_active() where applicable

md_get_array_info() == 0 implies an array is active, however this is more
correct.

Signed-off-by: Jes Sorensen <jsorensen@fb.com>

diff --git a/Incremental.c b/Incremental.c
index 28f1f7734956277c371b3d60915c1ff113b754db..a351151d0a0d2731942251915dee15342f1d7701 100644 (file)
--- a/Incremental.c
+++ b/Incremental.c
@@ -403,7 +403,7 @@ int Incremental(struct mddev_dev *devlist, struct context *c,
                    && ! policy_action_allows(policy, st->ss->name,
                                              act_re_add)
                    && c->runstop < 1) {
-                       if (md_get_array_info(mdfd, &ainf) == 0) {
+                       if (md_array_active(mdfd)) {
                                pr_err("not adding %s to active array (without --run) %s\n",
                                       devname, chosen_name);
                                rv = 2;
@@ -667,9 +667,8 @@ static void find_reject(int mdfd, struct supertype *st, struct mdinfo *sra,
         * and events less than the passed events, and remove the device.
         */
        struct mdinfo *d;
-       mdu_array_info_t ra;
 
-       if (md_get_array_info(mdfd, &ra) == 0)
+       if (md_array_active(mdfd))
                return; /* not safe to remove from active arrays
                         * without thinking more */