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

fix: correct unlocking of map file 

1. Three missing map_unlock() calls were added.
2. Map file must be unlocked on fork, else child will hold lock.

Signed-off-by: Lukasz Dorau <lukasz.dorau@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
Lukasz Dorau 2011-10-03 08:55:02 +11:00 committed by NeilBrown
parent e3da789055
commit cc700db34f
4 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Grow.c
View File

@ -2265,6 +2265,7 @@ started:
default:
return 0;
case 0:
map_fork();
break;
}
@ -2421,6 +2422,7 @@ int reshape_container(char *container, char *devname,
printf(Name ": multi-array reshape continues in background\n");
return 0;
case 0: /* child */
map_fork();
break;
}

3
Incremental.c
View File

@ -1469,6 +1469,7 @@ static int Incremental_container(struct supertype *st, char *devname,
"Cannot activate array(s).\n");
/* free container data and exit */
sysfs_free(list);
map_unlock(&map);
return 2;
}
@ -1532,6 +1533,7 @@ static int Incremental_container(struct supertype *st, char *devname,
fprintf(stderr, Name ": array %s/%s is "
"explicitly ignored by mdadm.conf\n",
match->container, match->member);
map_unlock(&map);
return 2;
}
if (match)
@ -1547,6 +1549,7 @@ static int Incremental_container(struct supertype *st, char *devname,
if (mdfd < 0) {
fprintf(stderr, Name ": failed to open %s: %s.\n",
chosen_name, strerror(errno));
map_unlock(&map);
return 2;
}

12
mapfile.c
View File

@ -159,6 +159,18 @@ void map_unlock(struct map_ent **melp)
lf = NULL;
}
void map_fork(void)
{
/* We are forking, so must close the lock file.
* Don't risk flushing anything though.
*/
if (lf) {
close(fileno(lf));
fclose(lf);
lf = NULL;
}
}
void map_add(struct map_ent **melp,
int devnum, char *metadata, int uuid[4], char *path)
{

1
mdadm.h
View File

@ -427,6 +427,7 @@ extern void map_add(struct map_ent **melp,
int devnum, char *metadata, int uuid[4], char *path);
extern int map_lock(struct map_ent **melp);
extern void map_unlock(struct map_ent **melp);
extern void map_fork(void);
/* various details can be requested */
enum sysfs_read_flags {