From f6616a74393bda0bcc23cdbb478c5c7ad457696e Mon Sep 17 00:00:00 2001 From: Matthias Kaehlcke Date: Thu, 18 Oct 2007 23:39:56 -0700 Subject: [PATCH] --- yaml --- r: 71435 b: refs/heads/master c: b70c394099851c1398e9fd0fd64cf13ef2d093a1 h: refs/heads/master i: 71433: 999894ff6e8c398eabf4f5fda45f4e434b22c015 71431: 5ce832ab0bde54f98473c91b926b77dbf22389fe v: v3 --- [refs] | 2 +- trunk/fs/eventpoll.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a14a605b3d4e..1ae4b1352125 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cfdaf9e5f95993264b5aee7cbb9dd16977bc11ed +refs/heads/master: b70c394099851c1398e9fd0fd64cf13ef2d093a1 diff --git a/trunk/fs/eventpoll.c b/trunk/fs/eventpoll.c index de6189291954..34f68f3a069a 100644 --- a/trunk/fs/eventpoll.c +++ b/trunk/fs/eventpoll.c @@ -325,15 +325,14 @@ static void ep_poll_safewake(struct poll_safewake *psw, wait_queue_head_t *wq) int wake_nests = 0; unsigned long flags; struct task_struct *this_task = current; - struct list_head *lsthead = &psw->wake_task_list, *lnk; + struct list_head *lsthead = &psw->wake_task_list; struct wake_task_node *tncur; struct wake_task_node tnode; spin_lock_irqsave(&psw->lock, flags); /* Try to see if the current task is already inside this wakeup call */ - list_for_each(lnk, lsthead) { - tncur = list_entry(lnk, struct wake_task_node, llink); + list_for_each_entry(tncur, lsthead, llink) { if (tncur->wq == wq || (tncur->task == this_task && ++wake_nests > EP_MAX_POLLWAKE_NESTS)) {