diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-12-31 16:40:15 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-05-26 09:16:44 +0200 |
| commit | f87be8948185a4f1085aea38bccd0d2ce07f711c (patch) | |
| tree | 55af5bc4b09a5b5fd7be9482e5f218706ef46c80 | |
| parent | e7a98d47eebde147e67dc1139d5d8a741c735a6a (diff) | |
| download | linux-rpi3-f87be8948185a4f1085aea38bccd0d2ce07f711c.tar.gz linux-rpi3-f87be8948185a4f1085aea38bccd0d2ce07f711c.tar.bz2 linux-rpi3-f87be8948185a4f1085aea38bccd0d2ce07f711c.zip | |
net/iucv: convert to ->poll_mask
Signed-off-by: Christoph Hellwig <hch@lst.de>
| -rw-r--r-- | include/net/iucv/af_iucv.h | 2 | ||||
| -rw-r--r-- | net/iucv/af_iucv.c | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h index f4c21b5a1242..b0eaeb02d46d 100644 --- a/include/net/iucv/af_iucv.h +++ b/include/net/iucv/af_iucv.h @@ -153,8 +153,6 @@ struct iucv_sock_list { atomic_t autobind_name; }; -__poll_t iucv_sock_poll(struct file *file, struct socket *sock, - poll_table *wait); void iucv_sock_link(struct iucv_sock_list *l, struct sock *s); void iucv_sock_unlink(struct iucv_sock_list *l, struct sock *s); void iucv_accept_enqueue(struct sock *parent, struct sock *sk); diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c index 893a022f9620..68e86257a549 100644 --- a/net/iucv/af_iucv.c +++ b/net/iucv/af_iucv.c @@ -1488,14 +1488,11 @@ static inline __poll_t iucv_accept_poll(struct sock *parent) return 0; } -__poll_t iucv_sock_poll(struct file *file, struct socket *sock, - poll_table *wait) +static __poll_t iucv_sock_poll_mask(struct socket *sock, __poll_t events) { struct sock *sk = sock->sk; __poll_t mask = 0; - sock_poll_wait(file, sk_sleep(sk), wait); - if (sk->sk_state == IUCV_LISTEN) return iucv_accept_poll(sk); @@ -2388,7 +2385,7 @@ static const struct proto_ops iucv_sock_ops = { .getname = iucv_sock_getname, .sendmsg = iucv_sock_sendmsg, .recvmsg = iucv_sock_recvmsg, - .poll = iucv_sock_poll, + .poll_mask = iucv_sock_poll_mask, .ioctl = sock_no_ioctl, .mmap = sock_no_mmap, .socketpair = sock_no_socketpair, |