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

Don't tsleep() while at splbio().

Browse Source 
Correctly return EINPROGRESS from aio_error() even when an aio request
is still in the socket queue.

Submitted by:	Adrian Chadd <adrian@bofh.co.uk>
This commit is contained in:
Jason Evans 2000-01-20 01:59:58 +00:00
parent 1b67001469
commit 60ffb01993
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/kern/vfs_aio.c
View File

@ -1543,12 +1543,12 @@ aio_suspend(struct proc *p, struct aio_suspend_args *uap)
} }
} }
} }
splx(s);
ki->kaio_flags |= KAIO_WAKEUP; ki->kaio_flags |= KAIO_WAKEUP;
error = tsleep(p, PRIBIO | PCATCH, "aiospn", timo); error = tsleep(p, PRIBIO | PCATCH, "aiospn", timo);
splx(s);
if (error == EINTR) { if (error == ERESTART || error == EINTR) {
zfree(aiol_zone, ijoblist); zfree(aiol_zone, ijoblist);
zfree(aiol_zone, ujoblist); zfree(aiol_zone, ujoblist);
return EINTR; return EINTR;
@ -1614,6 +1614,16 @@ aio_error(struct proc *p, struct aio_error_args *uap)
return 0; return 0;
} }
} }
for (cb = TAILQ_FIRST(&ki->kaio_sockqueue); cb; cb = TAILQ_NEXT(cb,
plist)) {
if (((intptr_t)cb->uaiocb._aiocb_private.kernelinfo) ==
jobref) {
p->p_retval[0] = EINPROGRESS;
splx(s);
return 0;
}
}
splx(s); splx(s);
s = splbio(); s = splbio();