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

Incremental: Fix a merge error in recent patch 

commit  81219e70f2 required
merging and I messed it up.
The locking shouldn't be there - the caller locks now.

Reported-by: "Labun, Marcin" <Marcin.Labun@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2011-11-01 15:17:03 +11:00
parent 819c158866
commit ad098cdd79
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Incremental.c
View File

@ -1404,9 +1404,6 @@ static int Incremental_container(struct supertype *st, char *devname,
/* when nothing to activate - quit */
if (list == NULL)
return 0;
if (map_lock(&map))
fprintf(stderr, Name ": failed to get exclusive lock on "
"mapfile\n");
for (ra = list ; ra ; ra = ra->next) {
int mdfd;
char chosen_name[1024];
@ -1501,10 +1498,8 @@ static int Incremental_container(struct supertype *st, char *devname,
/* don't move spares to container with volume being activated
when all volumes are blocked */
if (ra_all == ra_blocked) {
map_unlock(&map);
if (ra_all == ra_blocked)
return 0;
}
/* Now move all suitable spares from spare container */
domains = domain_from_array(list, st->ss->name);