]> git.baikalelectronics.ru Git - kernel.git/commitdiff
fs/epoll: rename check_events label to send_events
authorDavidlohr Bueso <dave@stgolabs.net>
Thu, 3 Jan 2019 23:27:22 +0000 (15:27 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Jan 2019 21:13:46 +0000 (13:13 -0800)
It is currently called check_events because it, well, did exactly that.
However, since the lockless ep_events_available() call, the label no
longer checks, but just sends the events.  Rename as such.

Link: http://lkml.kernel.org/r/20181114182532.27981-1-dave@stgolabs.net
Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Jason Baron <jbaron@akamai.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/eventpoll.c

index 9beb166b7264a69e89ce4c15a1b8418e9d4d8eb5..752dbc41c9415674fac3ec46fbbd9106766ef39f 100644 (file)
@@ -1774,7 +1774,7 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events,
                eavail = ep_events_available(ep);
                spin_unlock_irq(&ep->wq.lock);
 
-               goto check_events;
+               goto send_events;
        }
 
 fetch_events:
@@ -1784,7 +1784,7 @@ fetch_events:
 
        eavail = ep_events_available(ep);
        if (eavail)
-               goto check_events;
+               goto send_events;
 
        /*
         * Busy poll timed out.  Drop NAPI ID for now, we can add
@@ -1841,7 +1841,7 @@ fetch_events:
        __remove_wait_queue(&ep->wq, &wait);
        spin_unlock_irq(&ep->wq.lock);
 
-check_events:
+send_events:
        /*
         * Try to transfer events to user space. In case we get 0 events and
         * there's still timeout left over, we go trying again in search of