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

When detaching an AIO or LIO requests grab the lock and tell knlist_remove

Browse Source 
that we have the lock now.  This cleans up a locking panic ASSERT when
knlist_empty is called without a lock when INVARIANTS etc. are turned.

Reviewed by:	kib jhb
MFC after:	1 week
This commit is contained in:
Doug Ambrisko 2012-01-30 19:19:22 +00:00
parent bc536d5ac5
commit 8e9fc27818
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/kern/vfs_aio.c
View File

@ -2535,10 +2535,13 @@ filt_aioattach(struct knote *kn)
static void
filt_aiodetach(struct knote *kn)
{
struct aiocblist *aiocbe = kn->kn_ptr.p_aio;
struct knlist *knl;
if (!knlist_empty(&aiocbe->klist))
knlist_remove(&aiocbe->klist, kn, 0);
knl = &kn->kn_ptr.p_aio->klist;
knl->kl_lock(knl->kl_lockarg);
if (!knlist_empty(knl))
knlist_remove(knl, kn, 1);
knl->kl_unlock(knl->kl_lockarg);
}
/* kqueue filter function */
@ -2580,10 +2583,13 @@ filt_lioattach(struct knote *kn)
static void
filt_liodetach(struct knote *kn)
{
struct aioliojob * lj = kn->kn_ptr.p_lio;
struct knlist *knl;
if (!knlist_empty(&lj->klist))
knlist_remove(&lj->klist, kn, 0);
knl = &kn->kn_ptr.p_lio->klist;
knl->kl_lock(knl->kl_lockarg);
if (!knlist_empty(knl))
knlist_remove(knl, kn, 1);
knl->kl_unlock(knl->kl_lockarg);
}
/* kqueue filter function */