diff options
| author | NeilBrown <neilb@suse.de> | 2012-10-31 17:02:49 +1100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2012-11-20 12:08:36 +1100 |
| commit | 5e9fd96f213e79c8d8996bfbe90488a2f09e4d19 (patch) | |
| tree | cab42018e215f021fd801d9dfd5c5f50ed256647 /Assemble.c | |
| parent | 75a410f6226d1e3ef441bbb8cd4f198d5de5cf5b (diff) | |
Assemble: Fix critical-section-recovery when assembling a growing array.
commit aacb2f816afbddf56c406039b8e2e6c0dbc8a8a0
Assemble: add support for replacement devices.
broke the restoring of the 'critical section' because it messed up the
list of file descriptors passed to Grow_restart. Put it back the way
it should be.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'Assemble.c')
| -rw-r--r-- | Assemble.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1595,8 +1595,8 @@ try_again: pr_err(":%s has an active reshape - checking " "if critical section needs to be restored\n", chosen_name); - for (i=0; i<bestcnt; i++) { - int j = best[i]; + for (i = 0; i < bestcnt/2; i++) { + int j = best[i*2]; if (j >= 0) { fdlist[i] = dev_open(devices[j].devname, devices[j].included @@ -1614,7 +1614,7 @@ try_again: if (st->ss->external && st->ss->recover_backup) err = st->ss->recover_backup(st, content); else - err = Grow_restart(st, content, fdlist, bestcnt, + err = Grow_restart(st, content, fdlist, bestcnt/2, c->backup_file, c->verbose > 0); if (err && c->invalid_backup) { if (c->verbose > 0) |