[PATCH 1/5] Use wake_up_locked() in eventpoll

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Matthew Wilcox
Date: Wednesday, October 24, 2007 - 5:24 am

Replace the uses of __wake_up_locked with wake_up_locked

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
---
 fs/eventpoll.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 34f68f3..81c04ab 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -656,8 +656,7 @@ is_linked:
 	 * wait list.
 	 */
 	if (waitqueue_active(&ep->wq))
-		__wake_up_locked(&ep->wq, TASK_UNINTERRUPTIBLE |
-				 TASK_INTERRUPTIBLE);
+		wake_up_locked(&ep->wq);
 	if (waitqueue_active(&ep->poll_wait))
 		pwake++;
 
@@ -780,7 +779,7 @@ static int ep_insert(struct eventpoll *ep, struct epoll_event *event,
 
 		/* Notify waiting tasks that events are available */
 		if (waitqueue_active(&ep->wq))
-			__wake_up_locked(&ep->wq, TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE);
+			wake_up_locked(&ep->wq);
 		if (waitqueue_active(&ep->poll_wait))
 			pwake++;
 	}
@@ -854,8 +853,7 @@ static int ep_modify(struct eventpoll *ep, struct epitem *epi, struct epoll_even
 
 			/* Notify waiting tasks that events are available */
 			if (waitqueue_active(&ep->wq))
-				__wake_up_locked(&ep->wq, TASK_UNINTERRUPTIBLE |
-						 TASK_INTERRUPTIBLE);
+				wake_up_locked(&ep->wq);
 			if (waitqueue_active(&ep->poll_wait))
 				pwake++;
 		}
@@ -978,8 +976,7 @@ errxit:
 		 * wait list (delayed after we release the lock).
 		 */
 		if (waitqueue_active(&ep->wq))
-			__wake_up_locked(&ep->wq, TASK_UNINTERRUPTIBLE |
-					 TASK_INTERRUPTIBLE);
+			wake_up_locked(&ep->wq);
 		if (waitqueue_active(&ep->poll_wait))
 			pwake++;
 	}
-- 
1.4.4.2

-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 1/5] Use wake_up_locked() in eventpoll, Matthew Wilcox, (Wed Oct 24, 5:24 am)
[PATCH 2/5] Use macros instead of TASK_ flags, Matthew Wilcox, (Wed Oct 24, 5:24 am)
[PATCH 3/5] Add TASK_WAKEKILL, Matthew Wilcox, (Wed Oct 24, 5:24 am)
[PATCH 4/5] Add lock_page_killable, Matthew Wilcox, (Wed Oct 24, 5:24 am)
[PATCH 5/5] Make wait_on_retry_sync_kiocb killable, Matthew Wilcox, (Wed Oct 24, 5:24 am)
Re: [PATCH 2/5] Use macros instead of TASK_ flags, Andrew Morton, (Wed Oct 24, 8:31 pm)
Re: [PATCH 5/5] Make wait_on_retry_sync_kiocb killable, Andrew Morton, (Wed Oct 24, 8:43 pm)
Re: [PATCH 4/5] Add lock_page_killable, Andrew Morton, (Wed Oct 24, 9:11 pm)
Re: [PATCH 4/5] Add lock_page_killable, Nick Piggin, (Wed Oct 24, 9:13 pm)
Re: [PATCH 5/5] Make wait_on_retry_sync_kiocb killable, Zach Brown, (Thu Oct 25, 11:31 am)
Re: [PATCH 2/5] Use macros instead of TASK_ flags, Andrew Morton, (Fri Oct 26, 11:45 am)
Re: [PATCH 2/5] Use macros instead of TASK_ flags, Alexey Dobriyan, (Fri Oct 26, 1:39 pm)
Re: [PATCH 2/5] Use macros instead of TASK_ flags, Matthew Wilcox, (Fri Oct 26, 5:33 pm)