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

Commit 11c5ad0e authored by Ben Noordhuis's avatar Ben Noordhuis Committed by Al Viro
Browse files

eventpoll: switch to ->poll_mask 



Signed-off-by: default avatarBen Noordhuis <info@bnoordhuis.nl>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 2739b807

fs/eventpoll.c

+10 −5
Original line number Diff line number Diff line
@@ -922,13 +922,17 @@ static __poll_t ep_read_events_proc(struct eventpoll *ep, struct list_head *head 
	return 0;

}



static __poll_t ep_eventpoll_poll(struct file *file, poll_table *wait)

static struct wait_queue_head *ep_eventpoll_get_poll_head(struct file *file,

		__poll_t eventmask)

{

	struct eventpoll *ep = file->private_data;

	int depth = 0;

	return &ep->poll_wait;

}



	/* Insert inside our poll wait queue */

	poll_wait(file, &ep->poll_wait, wait);

static __poll_t ep_eventpoll_poll_mask(struct file *file, __poll_t eventmask)

{

	struct eventpoll *ep = file->private_data;

	int depth = 0;



	/*

	 * Proceed to find out if wanted events are really available inside
@@ -968,7 +972,8 @@ static const struct file_operations eventpoll_fops = { 
	.show_fdinfo	= ep_show_fdinfo,

#endif

	.release	= ep_eventpoll_release,

	.poll		= ep_eventpoll_poll,

	.get_poll_head	= ep_eventpoll_get_poll_head,

	.poll_mask	= ep_eventpoll_poll_mask,

	.llseek		= noop_llseek,

};