d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hashinit() calls MALLOC(), so release the filedesc lock in knote_attach()

Browse Source 
before calling hashinit() and relock afterwards, taking care to see that
we don't lose a race.
This commit is contained in:
Don Lewis 2002-10-03 06:03:26 +00:00
parent 80ce40f394
commit cb81d3ca4d
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/kern/kern_event.c
View File

@ -953,15 +953,27 @@ knote_fdclose(struct thread *td, int fd)
static void
knote_attach(struct knote *kn, struct filedesc *fdp)
{
struct klist *list, *oldlist;
struct klist *list, *oldlist, *tmp_knhash;
u_long tmp_knhashmask;
int size, newsize;
FILEDESC_LOCK(fdp);
if (! kn->kn_fop->f_isfd) {
if (fdp->fd_knhashmask == 0)
fdp->fd_knhash = hashinit(KN_HASHSIZE, M_KQUEUE,
&fdp->fd_knhashmask);
if (fdp->fd_knhashmask == 0) {
FILEDESC_UNLOCK(fdp);
tmp_knhash = hashinit(KN_HASHSIZE, M_KQUEUE,
&tmp_knhashmask);
FILEDESC_LOCK(fdp);
if (fdp->fd_knhashmask == 0) {
fdp->fd_knhash = tmp_knhash;
fdp->fd_knhashmask = tmp_knhashmask;
} else {
FILEDESC_UNLOCK(fdp);
free(tmp_knhash, M_KQUEUE);
FILEDESC_LOCK(fdp);
}
}
list = &fdp->fd_knhash[KN_HASH(kn->kn_id, fdp->fd_knhashmask)];
goto done;
}