xnu-1228.5.18.tar.gz

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

diff --git a/bsd/kern/kern_descrip.c b/bsd/kern/kern_descrip.c
index d44744be210e78cf978bb935d7ad05118085f4dc..0a67834ff191d0a05bf50976e71c2dd809ecca4c 100644 (file)
--- a/bsd/kern/kern_descrip.c
+++ b/bsd/kern/kern_descrip.c
@@ -3912,13 +3912,12 @@ fileproc_drain(proc_t p, struct fileproc * fp)
 
                lck_mtx_convert_spin(&p->p_fdmlock);
 
 
                lck_mtx_convert_spin(&p->p_fdmlock);
 

+               if (fp->f_fglob->fg_ops->fo_drain) {
+                       (*fp->f_fglob->fg_ops->fo_drain)(fp, &context);
+               }

                if (((fp->f_flags & FP_INSELECT)== FP_INSELECT)) {
                        wait_queue_wakeup_all((wait_queue_t)fp->f_waddr, &selwait, THREAD_INTERRUPTED);
                if (((fp->f_flags & FP_INSELECT)== FP_INSELECT)) {
                        wait_queue_wakeup_all((wait_queue_t)fp->f_waddr, &selwait, THREAD_INTERRUPTED);

-               } else  {
-                       if (fp->f_fglob->fg_ops->fo_drain) {
-                               (*fp->f_fglob->fg_ops->fo_drain)(fp, &context);
-                       }
-               }
+               } 

                p->p_fpdrainwait = 1;
 
                msleep(&p->p_fpdrainwait, &p->p_fdmlock, PRIBIO, "fpdrain", NULL);
                p->p_fpdrainwait = 1;
 
                msleep(&p->p_fpdrainwait, &p->p_fdmlock, PRIBIO, "fpdrain", NULL);