From d2ccaffffc23b5073dbb77f4ef8fb3560a3e99b5 Mon Sep 17 00:00:00 2001 From: ericm Date: Thu, 14 Aug 2008 17:10:45 +0000 Subject: [PATCH] branch: HEAD remove from wait queue after wake up, found by alex. b=16713 r=alex r=rread --- lustre/ptlrpc/sec_bulk.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lustre/ptlrpc/sec_bulk.c b/lustre/ptlrpc/sec_bulk.c index 6cb1653..12ff171 100644 --- 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); -- 1.8.3.1