OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ep_send_events_proc(): return result via esed->res 

preparations for not mixing __poll_t and int in ep_scan_ready_list()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2018-02-01 15:21:13 -05:00
parent e78cd95beb
commit d7ebbe46f4
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/eventpoll.c
View File

@ -260,6 +260,7 @@ struct ep_pqueue {
struct ep_send_events_data { struct ep_send_events_data {
int maxevents; int maxevents;
struct epoll_event __user *events; struct epoll_event __user *events;
int res;
}; };
/* /*
@ -1616,7 +1617,6 @@ static int ep_send_events_proc(struct eventpoll *ep, struct list_head *head,
void *priv) void *priv)
{ {
struct ep_send_events_data *esed = priv; struct ep_send_events_data *esed = priv;
int eventcnt;
unsigned int revents; unsigned int revents;
struct epitem *epi; struct epitem *epi;
struct epoll_event __user *uevent; struct epoll_event __user *uevent;
@ -1630,8 +1630,8 @@ static int ep_send_events_proc(struct eventpoll *ep, struct list_head *head,
* Items cannot vanish during the loop because ep_scan_ready_list() is * Items cannot vanish during the loop because ep_scan_ready_list() is
* holding "mtx" during this call. * holding "mtx" during this call.
*/ */
for (eventcnt = 0, uevent = esed->events; for (esed->res = 0, uevent = esed->events;
!list_empty(head) && eventcnt < esed->maxevents;) { !list_empty(head) && esed->res < esed->maxevents;) {
epi = list_first_entry(head, struct epitem, rdllink); epi = list_first_entry(head, struct epitem, rdllink);
/* /*
@ -1665,9 +1665,11 @@ static int ep_send_events_proc(struct eventpoll *ep, struct list_head *head,
__put_user(epi->event.data, &uevent->data)) { __put_user(epi->event.data, &uevent->data)) {
list_add(&epi->rdllink, head); list_add(&epi->rdllink, head);
ep_pm_stay_awake(epi); ep_pm_stay_awake(epi);
return eventcnt ? eventcnt : -EFAULT; if (!esed->res)
esed->res = -EFAULT;
return 0;
} }
eventcnt++; esed->res++;
uevent++; uevent++;
if (epi->event.events & EPOLLONESHOT) if (epi->event.events & EPOLLONESHOT)
epi->event.events &= EP_PRIVATE_BITS; epi->event.events &= EP_PRIVATE_BITS;
@ -1689,7 +1691,7 @@ static int ep_send_events_proc(struct eventpoll *ep, struct list_head *head,
} }
} }
return eventcnt; return 0;
} }
static int ep_send_events(struct eventpoll *ep, static int ep_send_events(struct eventpoll *ep,
@ -1700,7 +1702,8 @@ static int ep_send_events(struct eventpoll *ep,
esed.maxevents = maxevents; esed.maxevents = maxevents;
esed.events = events; esed.events = events;
return ep_scan_ready_list(ep, ep_send_events_proc, &esed, 0, false); ep_scan_ready_list(ep, ep_send_events_proc, &esed, 0, false);
return esed.res;
} }
static inline struct timespec64 ep_set_mstimeout(long ms) static inline struct timespec64 ep_set_mstimeout(long ms)