Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35cff1a6 authored by Davidlohr Bueso's avatar Davidlohr Bueso Committed by Linus Torvalds
Browse files

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: default avatarDavidlohr Bueso <dbueso@suse.de>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Jason Baron <jbaron@akamai.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent abc610e0

fs/eventpoll.c

+3 −3
Original line number Diff line number Diff line
@@ -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 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *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 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *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