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

Restructure aio_return() to eliminate duplicated code and facilitate Giant

Browse Source 
push down.
This commit is contained in:
Alan Cox 2002-04-08 04:57:56 +00:00
parent 9c2cd7e5a9
commit c0bf5caa74
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sys/kern/vfs_aio.c
View File

@ -1587,24 +1587,17 @@ aio_return(struct thread *td, struct aio_return_args *uap)
struct aiocb *ujob; struct aiocb *ujob;
struct kaioinfo *ki; struct kaioinfo *ki;
ki = p->p_aioinfo;
if (ki == NULL)
return EINVAL;
ujob = uap->aiocbp; ujob = uap->aiocbp;
jobref = fuword(&ujob->_aiocb_private.kernelinfo); jobref = fuword(&ujob->_aiocb_private.kernelinfo);
if (jobref == -1 || jobref == 0) if (jobref == -1 || jobref == 0)
return EINVAL; return EINVAL;
ki = p->p_aioinfo;
if (ki == NULL)
return EINVAL;
TAILQ_FOREACH(cb, &ki->kaio_jobdone, plist) { TAILQ_FOREACH(cb, &ki->kaio_jobdone, plist) {
if (((intptr_t) cb->uaiocb._aiocb_private.kernelinfo) == if (((intptr_t) cb->uaiocb._aiocb_private.kernelinfo) ==
jobref) { jobref) {
if (ujob == cb->uuaiocb) {
td->td_retval[0] =
cb->uaiocb._aiocb_private.status;
} else
td->td_retval[0] = EFAULT;
if (cb->uaiocb.aio_lio_opcode == LIO_WRITE) { if (cb->uaiocb.aio_lio_opcode == LIO_WRITE) {
p->p_stats->p_ru.ru_oublock += p->p_stats->p_ru.ru_oublock +=
cb->outputcharge; cb->outputcharge;
@ -1613,8 +1606,7 @@ aio_return(struct thread *td, struct aio_return_args *uap)
p->p_stats->p_ru.ru_inblock += cb->inputcharge; p->p_stats->p_ru.ru_inblock += cb->inputcharge;
cb->inputcharge = 0; cb->inputcharge = 0;
} }
aio_free_entry(cb); goto done;
return 0;
} }
} }
s = splbio(); s = splbio();
@ -1622,18 +1614,20 @@ aio_return(struct thread *td, struct aio_return_args *uap)
ncb = TAILQ_NEXT(cb, plist); ncb = TAILQ_NEXT(cb, plist);
if (((intptr_t) cb->uaiocb._aiocb_private.kernelinfo) if (((intptr_t) cb->uaiocb._aiocb_private.kernelinfo)
== jobref) { == jobref) {
splx(s); break;
if (ujob == cb->uuaiocb) {
td->td_retval[0] =
cb->uaiocb._aiocb_private.status;
} else
td->td_retval[0] = EFAULT;
aio_free_entry(cb);
return 0;
} }
} }
splx(s); splx(s);
done:
if (cb != NULL) {
if (ujob == cb->uuaiocb) {
td->td_retval[0] =
cb->uaiocb._aiocb_private.status;
} else
td->td_retval[0] = EFAULT;
aio_free_entry(cb);
return (0);
}
return (EINVAL); return (EINVAL);
} }