xnu-1699.32.7.tar.gz

[apple/xnu.git] / bsd / kern / kern_aio.c

diff --git a/bsd/kern/kern_aio.c b/bsd/kern/kern_aio.c
index b829fa26d1eb338499606364d82ec2ff570d7723..89a2ba0127085cd019328db9bc1383c940526f13 100644 (file)
--- a/bsd/kern/kern_aio.c
+++ b/bsd/kern/kern_aio.c
@@ -1200,7 +1200,7 @@ check_for_our_aiocbp:
         */
 
        error = msleep1(&p->AIO_SUSPEND_SLEEP_CHAN, aio_proc_mutex(p), PCATCH | PWAIT | PDROP, "aio_suspend", abstime); /* XXX better priority? */
         */
 
        error = msleep1(&p->AIO_SUSPEND_SLEEP_CHAN, aio_proc_mutex(p), PCATCH | PWAIT | PDROP, "aio_suspend", abstime); /* XXX better priority? */

-       if ( error == THREAD_AWAKENED ) {
+       if ( error == 0 ) {

                /* 
                 * got our wakeup call from aio_work_thread().
                 * Since we can get a wakeup on this channel from another thread in the 
                /* 
                 * got our wakeup call from aio_work_thread().
                 * Since we can get a wakeup on this channel from another thread in the 


@@ -1211,7 +1211,7 @@ check_for_our_aiocbp:
                 */
                goto check_for_our_aiocbp;
        }
                 */
                goto check_for_our_aiocbp;
        }

-       else if ( error == THREAD_TIMED_OUT ) {
+       else if ( error == EWOULDBLOCK ) {

                /* our timeout expired */
                error = EAGAIN;
        }
                /* our timeout expired */
                error = EAGAIN;
        }


@@ -1394,7 +1394,7 @@ aio_enqueue_work( proc_t procp, aio_workq_entry *entryp, int proc_locked)
        /* And work queue */
        aio_workq_lock_spin(queue);
        aio_workq_add_entry_locked(queue, entryp);
        /* And work queue */
        aio_workq_lock_spin(queue);
        aio_workq_add_entry_locked(queue, entryp);

-       wait_queue_wakeup_one(queue->aioq_waitq, queue, THREAD_AWAKENED);
+       wait_queue_wakeup_one(queue->aioq_waitq, queue, THREAD_AWAKENED, -1);

        aio_workq_unlock(queue);
        
        if (proc_locked == 0) {
        aio_workq_unlock(queue);
        
        if (proc_locked == 0) {