]> git.baikalelectronics.ru Git - kernel.git/commitdiff
epoll: move eavail next to the list_empty_careful check
authorSoheil Hassas Yeganeh <soheil@google.com>
Fri, 18 Dec 2020 22:01:54 +0000 (14:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Dec 2020 19:18:37 +0000 (11:18 -0800)
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>
fs/eventpoll.c

index b9d87745fae622c40fb5afab679618c75df250ae..d8eef21575871560f42a9eefa19951f58c220751 100644 (file)
@@ -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);
                /*