]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
imsm: Finalize reshape in metadata
authorAdam Kwolek <adam.kwolek@intel.com>
Thu, 6 Jan 2011 07:29:07 +0000 (18:29 +1100)
committerNeilBrown <neilb@suse.de>
Thu, 6 Jan 2011 07:29:07 +0000 (18:29 +1100)
When reshape is finished monitor calls set_array_state() and finishes migration in metadata.
This change allows for finishing metadata migration on reshape end.

Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
super-intel.c

index 5bc4aaa965d8e9f10ab1f9f0f094e3acde17112d..27385bb7c9fd4462b51bc949df14f1f2dcc87d8d 100644 (file)
@@ -4882,6 +4882,7 @@ static int imsm_set_array_state(struct active_array *a, int consistent)
                                dev->vol.curr_migr_unit = __cpu_to_le32(unit);
                                super->updates_pending++;
                        }
+                       return 0;
                } else {
                        if (a->last_checkpoint == 0 && a->prev_action == reshape) {
                                /* for some reason we aborted the reshape.
@@ -4916,7 +4917,6 @@ static int imsm_set_array_state(struct active_array *a, int consistent)
                                super->updates_pending++;
                        }                               
                }
-               return 0;
        }
 
        /* before we activate this array handle any missing disks */