diff options
authorGuillaume Knispel <>2009-08-15 19:30:24 +0200
committerLinus Torvalds <>2009-08-15 18:40:11 -0700
commitb2add73dbf93fd50f00564d7abc3e2b9aa9dd20c (patch)
parent5d12dc1fd6b0ba31d3166e42ed01996df6dad34e (diff)
poll/select: initialize triggered field of struct poll_wqueues
The triggered field of struct poll_wqueues introduced in commit 5f820f648c92a5ecc771a96b3c29aa6e90013bba ("poll: allow f_op->poll to sleep"). It was first set to 1 in pollwake() (now __pollwake() ), tested and later set to 0 in poll_schedule_timeout(), but not initialized before. As a result when the process needs to sleep, triggered was likely to be non-zero even if pollwake() is not called before the first poll_schedule_timeout(), meaning schedule_hrtimeout_range() would not be called and an extra loop calling all ->poll() would be done. This patch initialize triggered to 0 in poll_initwait() so the ->poll() are not called twice before the process goes to sleep when it needs to. Signed-off-by: Guillaume Knispel <> Acked-by: Thomas Gleixner <> Acked-by: Tejun Heo <> Cc: Signed-off-by: Linus Torvalds <>
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/select.c b/fs/select.c
index d870237e42c7..8084834e123e 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -110,6 +110,7 @@ void poll_initwait(struct poll_wqueues *pwq)
init_poll_funcptr(&pwq->pt, __pollwait);
pwq->polling_task = current;
+ pwq->triggered = 0;
pwq->error = 0;
pwq->table = NULL;
pwq->inline_index = 0;