summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavidlohr Bueso <dave@stgolabs.net>2019-01-03 15:27:22 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-01-04 13:13:46 -0800
commit35cff1a6e0236500584a8ae227fe08120d9b5ee2 (patch)
treeccce0eaf5e62685b6406127d56519dca196e459c
parentabc610e01c663e25c41a3bdcbc4115cd7fbb047b (diff)
fs/epoll: rename check_events label to send_events
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>
-rw-r--r--fs/eventpoll.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 9beb166b7264..752dbc41c941 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -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