branch: HEAD

remove from wait queue after wake up, found by alex.
b=16713
r=alex
r=rread

diff --git a/lustre/ptlrpc/sec_bulk.c b/lustre/ptlrpc/sec_bulk.c
index 6cb1653..12ff171 100644 (file)
--- a/lustre/ptlrpc/sec_bulk.c
+++ b/lustre/ptlrpc/sec_bulk.c
@@ -542,12 +542,13 @@ again:
                                 page_pools.epp_st_max_wqlen =
                                                 page_pools.epp_waitqlen;
 
-                        set_current_state(TASK_UNINTERRUPTIBLE);
+                        set_current_state(CFS_TASK_UNINT);
                         cfs_waitlink_init(&waitlink);
                         cfs_waitq_add(&page_pools.epp_waitq, &waitlink);
 
                         spin_unlock(&page_pools.epp_lock);
-                        cfs_schedule();
+                        cfs_waitq_wait(&waitlink, CFS_TASK_UNINT);
+                        cfs_waitq_del(&page_pools.epp_waitq, &waitlink);
                         spin_lock(&page_pools.epp_lock);
 
                         LASSERT(page_pools.epp_waitqlen > 0);