iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fold ep_read_events_proc() into the only caller

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2020-09-26 18:48:57 -04:00
parent ad9366b136
commit 2c0b71c1e9
1 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
fs/eventpoll.c
View File

@ -729,14 +729,17 @@ static int ep_eventpoll_release(struct inode *inode, struct file *file)
return 0; return 0;
} }
static __poll_t ep_read_events_proc(struct eventpoll *ep, struct list_head *head, static __poll_t ep_item_poll(const struct epitem *epi, poll_table *pt, int depth);
int depth);
static __poll_t __ep_eventpoll_poll(struct file *file, poll_table *wait, int depth) static __poll_t __ep_eventpoll_poll(struct file *file, poll_table *wait, int depth)
{ {
struct eventpoll *ep = file->private_data; struct eventpoll *ep = file->private_data;
LIST_HEAD(txlist); LIST_HEAD(txlist);
__poll_t res; struct epitem *epi, *tmp;
poll_table pt;
__poll_t res = 0;
init_poll_funcptr(&pt, NULL);
/* Insert inside our poll wait queue */ /* Insert inside our poll wait queue */
poll_wait(file, &ep->poll_wait, wait); poll_wait(file, &ep->poll_wait, wait);
@ -747,7 +750,20 @@ static __poll_t __ep_eventpoll_poll(struct file *file, poll_table *wait, int dep
*/ */
mutex_lock_nested(&ep->mtx, depth); mutex_lock_nested(&ep->mtx, depth);
ep_start_scan(ep, &txlist); ep_start_scan(ep, &txlist);
res = ep_read_events_proc(ep, &txlist, depth + 1); list_for_each_entry_safe(epi, tmp, &txlist, rdllink) {
if (ep_item_poll(epi, &pt, depth + 1)) {
res = EPOLLIN | EPOLLRDNORM;
break;
} else {
/*
* Item has been dropped into the ready list by the poll
* callback, but it's not actually ready, as far as
* caller requested events goes. We can remove it here.
*/
__pm_relax(ep_wakeup_source(epi));
list_del_init(&epi->rdllink);
}
}
ep_done_scan(ep, &txlist); ep_done_scan(ep, &txlist);
mutex_unlock(&ep->mtx); mutex_unlock(&ep->mtx);
return res; return res;
@ -772,31 +788,6 @@ static __poll_t ep_item_poll(const struct epitem *epi, poll_table *pt,
return res & epi->event.events; return res & epi->event.events;
} }
static __poll_t ep_read_events_proc(struct eventpoll *ep, struct list_head *head,
int depth)
{
struct epitem *epi, *tmp;
poll_table pt;
init_poll_funcptr(&pt, NULL);
list_for_each_entry_safe(epi, tmp, head, rdllink) {
if (ep_item_poll(epi, &pt, depth)) {
return EPOLLIN | EPOLLRDNORM;
} else {
/*
* Item has been dropped into the ready list by the poll
* callback, but it's not actually ready, as far as
* caller requested events goes. We can remove it here.
*/
__pm_relax(ep_wakeup_source(epi));
list_del_init(&epi->rdllink);
}
}
return 0;
}
static __poll_t ep_eventpoll_poll(struct file *file, poll_table *wait) static __poll_t ep_eventpoll_poll(struct file *file, poll_table *wait)
{ {
return __ep_eventpoll_poll(file, wait, 0); return __ep_eventpoll_poll(file, wait, 0);