Commit f87be894 authored by Christoph Hellwig's avatar Christoph Hellwig

net/iucv: convert to ->poll_mask

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent e7a98d47
...@@ -153,8 +153,6 @@ struct iucv_sock_list { ...@@ -153,8 +153,6 @@ struct iucv_sock_list {
atomic_t autobind_name; 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_link(struct iucv_sock_list *l, struct sock *s);
void iucv_sock_unlink(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); void iucv_accept_enqueue(struct sock *parent, struct sock *sk);
......
...@@ -1488,14 +1488,11 @@ static inline __poll_t iucv_accept_poll(struct sock *parent) ...@@ -1488,14 +1488,11 @@ static inline __poll_t iucv_accept_poll(struct sock *parent)
return 0; return 0;
} }
__poll_t iucv_sock_poll(struct file *file, struct socket *sock, static __poll_t iucv_sock_poll_mask(struct socket *sock, __poll_t events)
poll_table *wait)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
__poll_t mask = 0; __poll_t mask = 0;
sock_poll_wait(file, sk_sleep(sk), wait);
if (sk->sk_state == IUCV_LISTEN) if (sk->sk_state == IUCV_LISTEN)
return iucv_accept_poll(sk); return iucv_accept_poll(sk);
...@@ -2388,7 +2385,7 @@ static const struct proto_ops iucv_sock_ops = { ...@@ -2388,7 +2385,7 @@ static const struct proto_ops iucv_sock_ops = {
.getname = iucv_sock_getname, .getname = iucv_sock_getname,
.sendmsg = iucv_sock_sendmsg, .sendmsg = iucv_sock_sendmsg,
.recvmsg = iucv_sock_recvmsg, .recvmsg = iucv_sock_recvmsg,
.poll = iucv_sock_poll, .poll_mask = iucv_sock_poll_mask,
.ioctl = sock_no_ioctl, .ioctl = sock_no_ioctl,
.mmap = sock_no_mmap, .mmap = sock_no_mmap,
.socketpair = sock_no_socketpair, .socketpair = sock_no_socketpair,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment