Home » Mailing list archives » linux-kernel » 2007 » October » 18

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

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Matthew Wilcox <matthew@...>
To: <linux-kernel@...>
Cc: Matthew Wilcox <matthew@...>, Matthew Wilcox <willy@...>
Subject: [PATCH 1/5] Use wake_up_locked() in eventpoll
Date: Thursday, October 18, 2007 - 6:25 pm

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 77b9953..72e4cb4 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -657,8 +657,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++;
 
@@ -781,7 +780,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++;
 	}
@@ -855,8 +854,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++;
 		}
@@ -979,8 +977,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 0/5] TASK_KILLABLE, Matthew Wilcox, (Thu Oct 18, 6:25 pm)
Re: [PATCH 0/5] TASK_KILLABLE, Nick Piggin, (Wed Oct 24, 11:55 pm)
[PATCH 2/5] Use macros instead of TASK_ flags, Matthew Wilcox, (Thu Oct 18, 6:25 pm)
Re: [PATCH 2/5] Use macros instead of TASK_ flags, Nick Piggin, (Wed Oct 24, 11:50 pm)
[PATCH 3/5] Add TASK_WAKEKILL, Matthew Wilcox, (Thu Oct 18, 6:26 pm)
[PATCH 4/5] Add lock_page_killable, Matthew Wilcox, (Thu Oct 18, 6:26 pm)
[PATCH 5/5] Make wait_on_retry_sync_kiocb killable, Matthew Wilcox, (Thu Oct 18, 6:26 pm)
Re: [PATCH 5/5] Make wait_on_retry_sync_kiocb killable, Nick Piggin, (Wed Oct 24, 11:53 pm)
[PATCH 1/5] Use wake_up_locked() in eventpoll, Matthew Wilcox, (Thu Oct 18, 6:25 pm)
Re: [PATCH 1/5] Use wake_up_locked() in eventpoll, Arjan van de Ven, (Thu Oct 18, 11:56 pm)
Re: [PATCH 1/5] Use wake_up_locked() in eventpoll, Matthew Wilcox, (Fri Oct 19, 12:28 pm)