brain-hackers_pepepper-mirror/linux-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/linux-brain.git synced 2024-06-09 23:36:23 +09:00
Code Issues Projects Releases Wiki Activity

fs/eventpoll.c: simplify ep_is_linked() callers

Browse Source 
Instead of having each caller pass the rdllink explicitly, just have
ep_is_linked() pass it while the callers just need the epi pointer.  This
helper is all about the rdllink, and this change, furthermore, improves
the function's self documentation.

Link: http://lkml.kernel.org/r/20180727053432.16679-3-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>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Davidlohr Bueso 2018-08-21 21:58:26 -07:00 committed by Linus Torvalds
parent 679abf381a
commit 992991c03c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/eventpoll.c
View File

@ -336,9 +336,9 @@ static inline int ep_cmp_ffd(struct epoll_filefd *p1,
} }
/* Tells us if the item is currently linked */ /* Tells us if the item is currently linked */
static inline int ep_is_linked(struct list_head *p) static inline int ep_is_linked(struct epitem *epi)
{ {
return !list_empty(p); return !list_empty(&epi->rdllink);
} }
static inline struct eppoll_entry *ep_pwq_from_wait(wait_queue_entry_t *p) static inline struct eppoll_entry *ep_pwq_from_wait(wait_queue_entry_t *p)
@ -721,7 +721,7 @@ static __poll_t ep_scan_ready_list(struct eventpoll *ep,
* queued into ->ovflist but the "txlist" might already * queued into ->ovflist but the "txlist" might already
* contain them, and the list_splice() below takes care of them. * contain them, and the list_splice() below takes care of them.
*/ */
if (!ep_is_linked(&epi->rdllink)) { if (!ep_is_linked(epi)) {
list_add_tail(&epi->rdllink, &ep->rdllist); list_add_tail(&epi->rdllink, &ep->rdllist);
ep_pm_stay_awake(epi); ep_pm_stay_awake(epi);
} }
@ -790,7 +790,7 @@ static int ep_remove(struct eventpoll *ep, struct epitem *epi)
rb_erase_cached(&epi->rbn, &ep->rbr); rb_erase_cached(&epi->rbn, &ep->rbr);
spin_lock_irq(&ep->wq.lock); spin_lock_irq(&ep->wq.lock);
if (ep_is_linked(&epi->rdllink)) if (ep_is_linked(epi))
list_del_init(&epi->rdllink); list_del_init(&epi->rdllink);
spin_unlock_irq(&ep->wq.lock); spin_unlock_irq(&ep->wq.lock);
@ -1171,7 +1171,7 @@ static int ep_poll_callback(wait_queue_entry_t *wait, unsigned mode, int sync, v
} }
/* If this file is already in the ready list we exit soon */ /* If this file is already in the ready list we exit soon */
if (!ep_is_linked(&epi->rdllink)) { if (!ep_is_linked(epi)) {
list_add_tail(&epi->rdllink, &ep->rdllist); list_add_tail(&epi->rdllink, &ep->rdllist);
ep_pm_stay_awake_rcu(epi); ep_pm_stay_awake_rcu(epi);
} }
@ -1495,7 +1495,7 @@ static int ep_insert(struct eventpoll *ep, const struct epoll_event *event,
ep_set_busy_poll_napi_id(epi); ep_set_busy_poll_napi_id(epi);
/* If the file is already "ready" we drop it inside the ready list */ /* If the file is already "ready" we drop it inside the ready list */
if (revents && !ep_is_linked(&epi->rdllink)) { if (revents && !ep_is_linked(epi)) {
list_add_tail(&epi->rdllink, &ep->rdllist); list_add_tail(&epi->rdllink, &ep->rdllist);
ep_pm_stay_awake(epi); ep_pm_stay_awake(epi);
@ -1533,7 +1533,7 @@ static int ep_insert(struct eventpoll *ep, const struct epoll_event *event,
* And ep_insert() is called with "mtx" held. * And ep_insert() is called with "mtx" held.
*/ */
spin_lock_irq(&ep->wq.lock); spin_lock_irq(&ep->wq.lock);
if (ep_is_linked(&epi->rdllink)) if (ep_is_linked(epi))
list_del_init(&epi->rdllink); list_del_init(&epi->rdllink);
spin_unlock_irq(&ep->wq.lock); spin_unlock_irq(&ep->wq.lock);
@ -1601,7 +1601,7 @@ static int ep_modify(struct eventpoll *ep, struct epitem *epi,
*/ */
if (ep_item_poll(epi, &pt, 1)) { if (ep_item_poll(epi, &pt, 1)) {
spin_lock_irq(&ep->wq.lock); spin_lock_irq(&ep->wq.lock);
if (!ep_is_linked(&epi->rdllink)) { if (!ep_is_linked(epi)) {
list_add_tail(&epi->rdllink, &ep->rdllist); list_add_tail(&epi->rdllink, &ep->rdllist);
ep_pm_stay_awake(epi); ep_pm_stay_awake(epi);