Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Assemble: Fix critical-section-recovery when assembling a growing array. 

commit aacb2f816a
    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>
This commit is contained in:
NeilBrown 2012-10-31 17:02:49 +11:00
parent 75a410f622
commit 5e9fd96f21
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assemble.c
View File

@ -1595,8 +1595,8 @@ try_again:
pr_err(":%s has an active reshape - checking " pr_err(":%s has an active reshape - checking "
"if critical section needs to be restored\n", "if critical section needs to be restored\n",
chosen_name); chosen_name);
for (i=0; i<bestcnt; i++) { for (i = 0; i < bestcnt/2; i++) {
int j = best[i]; int j = best[i*2];
if (j >= 0) { if (j >= 0) {
fdlist[i] = dev_open(devices[j].devname, fdlist[i] = dev_open(devices[j].devname,
devices[j].included devices[j].included
@ -1614,7 +1614,7 @@ try_again:
if (st->ss->external && st->ss->recover_backup) if (st->ss->external && st->ss->recover_backup)
err = st->ss->recover_backup(st, content); err = st->ss->recover_backup(st, content);
else else
err = Grow_restart(st, content, fdlist, bestcnt, err = Grow_restart(st, content, fdlist, bestcnt/2,
c->backup_file, c->verbose > 0); c->backup_file, c->verbose > 0);
if (err && c->invalid_backup) { if (err && c->invalid_backup) {
if (c->verbose > 0) if (c->verbose > 0)