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

Incremental() lock error handling 

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
Jes Sorensen 2011-10-22 11:34:08 +11:00 committed by NeilBrown
parent e69104392b
commit 25824e2d07
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Incremental.c
View File

@ -298,7 +298,7 @@ int Incremental(char *devname, int verbose, int runstop,
name_to_use, autof, trustworthy, chosen_name);
if (mdfd < 0)
goto out;
goto out_unlock;
sysfs_init(&info, mdfd, 0);
@ -306,7 +306,7 @@ int Incremental(char *devname, int verbose, int runstop,
fprintf(stderr, Name ": failed to set array info for %s: %s\n",
chosen_name, strerror(errno));
rv = 2;
goto out;
goto out_unlock;
}
dinfo = info;
@ -317,7 +317,7 @@ int Incremental(char *devname, int verbose, int runstop,
devname, chosen_name, strerror(errno));
ioctl(mdfd, STOP_ARRAY, 0);
rv = 2;
goto out;
goto out_unlock;
}
sra = sysfs_read(mdfd, -1, (GET_DEVS | GET_STATE |
GET_OFFSET | GET_SIZE));
@ -333,7 +333,7 @@ int Incremental(char *devname, int verbose, int runstop,
" --incremental reliably. Aborting.\n");
sysfs_free(sra);
rv = 2;
goto out;
goto out_unlock;
}
info.array.working_disks = 1;
/* 6/ Make sure /var/run/mdadm.map contains this array. */
@ -380,12 +380,12 @@ int Incremental(char *devname, int verbose, int runstop,
": not adding %s to active array (without --run) %s\n",
devname, chosen_name);
rv = 2;
goto out;
goto out_unlock;
}
}
if (!sra) {
rv = 2;
goto out;
goto out_unlock;
}
if (sra->devs) {
sprintf(dn, "%d:%d", sra->devs->disk.major,
@ -400,7 +400,7 @@ int Incremental(char *devname, int verbose, int runstop,
devname, chosen_name);
close(dfd2);
rv = 2;
goto out;
goto out_unlock;
}
close(dfd2);
st2->ss->getinfo_super(st2, &info2, NULL);
@ -412,7 +412,7 @@ int Incremental(char *devname, int verbose, int runstop,
": unexpected difference between %s and %s.\n",
chosen_name, devname);
rv = 2;
goto out;
goto out_unlock;
}
}
info2.disk.major = major(stb.st_rdev);
@ -433,7 +433,7 @@ int Incremental(char *devname, int verbose, int runstop,
fprintf(stderr, Name ": failed to add %s to %s: %s.\n",
devname, chosen_name, strerror(errno));
rv = 2;
goto out;
goto out_unlock;
}
info.array.working_disks = 0;
for (d = sra->devs; d; d=d->next)
@ -489,9 +489,8 @@ int Incremental(char *devname, int verbose, int runstop,
fprintf(stderr, Name
": %s attached to %s, not enough to start (%d).\n",
devname, chosen_name, active_disks);
map_unlock(&map);
rv = 0;
goto out;
goto out_unlock;
}
/* 7b/ if yes, */
@ -505,9 +504,8 @@ int Incremental(char *devname, int verbose, int runstop,
fprintf(stderr, Name
": %s attached to %s which is already active.\n",
devname, chosen_name);
map_unlock(&map);
rv = 0;
goto out;
goto out_unlock;
}
map_unlock(&map);
@ -588,6 +586,9 @@ out:
if (sra)
sysfs_free(sra);
return rv;
out_unlock:
map_unlock(&map);
goto out;
}
static struct mddev_ident *search_mdstat(struct supertype *st,