Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 71435
b: refs/heads/master
c: b70c394
h: refs/heads/master
i:
  71433: 999894f
  71431: 5ce832a
v: v3
  • Loading branch information
Matthias Kaehlcke authored and Linus Torvalds committed Oct 19, 2007
1 parent da505ee commit f6616a7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cfdaf9e5f95993264b5aee7cbb9dd16977bc11ed
refs/heads/master: b70c394099851c1398e9fd0fd64cf13ef2d093a1
5 changes: 2 additions & 3 deletions trunk/fs/eventpoll.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down

0 comments on commit f6616a7

Please sign in to comment.