diff options
author | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
---|---|---|
committer | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
commit | bf8e8a6e8f0bd9165109f0a258730dd242299815 (patch) | |
tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/kern/vfs_aio.c | |
parent | 2180deee00350fff613a1d1d1328eddc4c0ba9c8 (diff) | |
download | FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.zip FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.tar.gz |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
Diffstat (limited to 'sys/kern/vfs_aio.c')
-rw-r--r-- | sys/kern/vfs_aio.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 9532ff2..5cee627 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -392,7 +392,7 @@ aio_init_aioinfo(struct proc *p) struct kaioinfo *ki; if (p->p_aioinfo == NULL) { - ki = uma_zalloc(kaio_zone, M_WAITOK); + ki = uma_zalloc(kaio_zone, 0); p->p_aioinfo = ki; ki->kaio_flags = 0; ki->kaio_maxactive_count = max_aio_per_proc; @@ -777,7 +777,7 @@ aio_daemon(void *uproc) * Allocate and ready the aio control info. There is one aiop structure * per daemon. */ - aiop = uma_zalloc(aiop_zone, M_WAITOK); + aiop = uma_zalloc(aiop_zone, 0); aiop->aiothread = td; aiop->aiothreadflags |= AIOP_FREE; @@ -801,9 +801,9 @@ aio_daemon(void *uproc) mtx_unlock(&Giant); /* The daemon resides in its own pgrp. */ MALLOC(newpgrp, struct pgrp *, sizeof(struct pgrp), M_PGRP, - M_WAITOK | M_ZERO); + M_ZERO); MALLOC(newsess, struct session *, sizeof(struct session), M_SESSION, - M_WAITOK | M_ZERO); + M_ZERO); sx_xlock(&proctree_lock); enterpgrp(mycp, mycp->p_pid, newpgrp, newsess); @@ -1301,7 +1301,7 @@ _aio_aqueue(struct thread *td, struct aiocb *job, struct aio_liojob *lj, int typ struct kqueue *kq; struct file *kq_fp; - aiocbe = uma_zalloc(aiocb_zone, M_WAITOK); + aiocbe = uma_zalloc(aiocb_zone, 0); aiocbe->inputcharge = 0; aiocbe->outputcharge = 0; callout_handle_init(&aiocbe->timeouthandle); @@ -1647,8 +1647,8 @@ aio_suspend(struct thread *td, struct aio_suspend_args *uap) return (EAGAIN); njoblist = 0; - ijoblist = uma_zalloc(aiol_zone, M_WAITOK); - ujoblist = uma_zalloc(aiol_zone, M_WAITOK); + ijoblist = uma_zalloc(aiol_zone, 0); + ujoblist = uma_zalloc(aiol_zone, 0); cbptr = uap->aiocbp; for (i = 0; i < uap->nent; i++) { @@ -1971,7 +1971,7 @@ lio_listio(struct thread *td, struct lio_listio_args *uap) if ((nent + ki->kaio_queue_count) > ki->kaio_qallowed_count) return (EAGAIN); - lj = uma_zalloc(aiolio_zone, M_WAITOK); + lj = uma_zalloc(aiolio_zone, 0); if (!lj) return (EAGAIN); |