summaryrefslogtreecommitdiffstats
path: root/fs/eventpoll.c
diff options
context:
space:
mode:
authorSoheil Hassas Yeganeh <soheil@google.com>2020-12-18 23:01:54 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2020-12-19 20:18:37 +0100
commite411596d48b5b77632deb91afcbc3185b9b658cb (patch)
treeb89bc08681b2831ae6a2a39fb361f714785af08e /fs/eventpoll.c
parentepoll: pull fatal signal checks into ep_send_events() (diff)
downloadlinux-e411596d48b5b77632deb91afcbc3185b9b658cb.tar.xz
linux-e411596d48b5b77632deb91afcbc3185b9b658cb.zip
epoll: move eavail next to the list_empty_careful check
This is a no-op change and simply to make the code more coherent. Link: https://lkml.kernel.org/r/20201106231635.3528496-5-soheil.kdev@gmail.com Signed-off-by: Soheil Hassas Yeganeh <soheil@google.com> Suggested-by: Linus Torvalds <torvalds@linux-foundation.org> Reviewed-by: Eric Dumazet <edumazet@google.com> Reviewed-by: Willem de Bruijn <willemb@google.com> Reviewed-by: Khazhismel Kumykov <khazhy@google.com> Cc: Guantao Liu <guantaol@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/eventpoll.c')
-rw-r--r--fs/eventpoll.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index b9d87745fae6..d8eef2157587 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -1828,6 +1828,7 @@ fetch_events:
if (!eavail)
timed_out = !schedule_hrtimeout_range(to, slack,
HRTIMER_MODE_ABS);
+ __set_current_state(TASK_RUNNING);
/*
* We were woken up, thus go and try to harvest some events.
@@ -1837,8 +1838,6 @@ fetch_events:
eavail = 1;
} while (0);
- __set_current_state(TASK_RUNNING);
-
if (!list_empty_careful(&wait.entry)) {
write_lock_irq(&ep->lock);
/*