Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

eventpoll: switch to ->poll_mask

Signed-off-by: Ben Noordhuis <info@bnoordhuis.nl>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

authored by

Ben Noordhuis and committed by
Al Viro
11c5ad0e 2739b807

+10 -5
+10 -5
fs/eventpoll.c
··· 922 922 return 0; 923 923 } 924 924 925 - static __poll_t ep_eventpoll_poll(struct file *file, poll_table *wait) 925 + static struct wait_queue_head *ep_eventpoll_get_poll_head(struct file *file, 926 + __poll_t eventmask) 927 + { 928 + struct eventpoll *ep = file->private_data; 929 + return &ep->poll_wait; 930 + } 931 + 932 + static __poll_t ep_eventpoll_poll_mask(struct file *file, __poll_t eventmask) 926 933 { 927 934 struct eventpoll *ep = file->private_data; 928 935 int depth = 0; 929 - 930 - /* Insert inside our poll wait queue */ 931 - poll_wait(file, &ep->poll_wait, wait); 932 936 933 937 /* 934 938 * Proceed to find out if wanted events are really available inside ··· 972 968 .show_fdinfo = ep_show_fdinfo, 973 969 #endif 974 970 .release = ep_eventpoll_release, 975 - .poll = ep_eventpoll_poll, 971 + .get_poll_head = ep_eventpoll_get_poll_head, 972 + .poll_mask = ep_eventpoll_poll_mask, 976 973 .llseek = noop_llseek, 977 974 }; 978 975