summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDavide Libenzi <davidel@xmailserver.org>2011-03-22 16:34:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-22 17:44:15 -0700
commit3fb0e584a68cd1c5085e69be441f2ad032aaee72 (patch)
tree8cf550c8fabf54aeca48d76538357b7211a18c83 /fs
parentd03e1617f089c0bcbc22b9d4739e04a0b43b14fa (diff)
downloadop-kernel-dev-3fb0e584a68cd1c5085e69be441f2ad032aaee72.zip
op-kernel-dev-3fb0e584a68cd1c5085e69be441f2ad032aaee72.tar.gz
epoll: move ready event check into proper inline
Move the event readiness check into a proper inline, and use it uniformly inside ep_poll() code. Events in the ->ovflist are no less ready than the ones in ->rdllist. Signed-off-by: Davide Libenzi <davidel@xmailserver.org> Cc: Shawn Bohrer <shawn.bohrer@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/eventpoll.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index ff12f7a..57298d0 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -316,6 +316,19 @@ static void ep_nested_calls_init(struct nested_calls *ncalls)
}
/**
+ * ep_events_available - Checks if ready events might be available.
+ *
+ * @ep: Pointer to the eventpoll context.
+ *
+ * Returns: Returns a value different than zero if ready events are available,
+ * or zero otherwise.
+ */
+static inline int ep_events_available(struct eventpoll *ep)
+{
+ return !list_empty(&ep->rdllist) || ep->ovflist != EP_UNACTIVE_PTR;
+}
+
+/**
* ep_call_nested - Perform a bound (possibly) nested call, by checking
* that the recursion limit is not exceeded, and that
* the same nested call (by the meaning of same cookie) is
@@ -1158,7 +1171,7 @@ retry:
spin_lock_irqsave(&ep->lock, flags);
res = 0;
- if (list_empty(&ep->rdllist)) {
+ if (!ep_events_available(ep)) {
/*
* We don't have any available event to return to the caller.
* We need to sleep here, and we will be wake up by
@@ -1174,7 +1187,7 @@ retry:
* to TASK_INTERRUPTIBLE before doing the checks.
*/
set_current_state(TASK_INTERRUPTIBLE);
- if (!list_empty(&ep->rdllist) || timed_out)
+ if (ep_events_available(ep) || timed_out)
break;
if (signal_pending(current)) {
res = -EINTR;
@@ -1192,7 +1205,7 @@ retry:
set_current_state(TASK_RUNNING);
}
/* Is it worth to try to dig for events ? */
- eavail = !list_empty(&ep->rdllist) || ep->ovflist != EP_UNACTIVE_PTR;
+ eavail = ep_events_available(ep);
spin_unlock_irqrestore(&ep->lock, flags);
OpenPOWER on IntegriCloud