|
@@ -850,18 +850,11 @@ static int vsock_shutdown(struct socket *sock, int mode)
|
|
|
return err;
|
|
|
}
|
|
|
|
|
|
-static __poll_t vsock_poll(struct file *file, struct socket *sock,
|
|
|
- poll_table *wait)
|
|
|
+static __poll_t vsock_poll_mask(struct socket *sock, __poll_t events)
|
|
|
{
|
|
|
- struct sock *sk;
|
|
|
- __poll_t mask;
|
|
|
- struct vsock_sock *vsk;
|
|
|
-
|
|
|
- sk = sock->sk;
|
|
|
- vsk = vsock_sk(sk);
|
|
|
-
|
|
|
- poll_wait(file, sk_sleep(sk), wait);
|
|
|
- mask = 0;
|
|
|
+ struct sock *sk = sock->sk;
|
|
|
+ struct vsock_sock *vsk = vsock_sk(sk);
|
|
|
+ __poll_t mask = 0;
|
|
|
|
|
|
if (sk->sk_err)
|
|
|
/* Signify that there has been an error on this socket. */
|
|
@@ -1091,7 +1084,7 @@ static const struct proto_ops vsock_dgram_ops = {
|
|
|
.socketpair = sock_no_socketpair,
|
|
|
.accept = sock_no_accept,
|
|
|
.getname = vsock_getname,
|
|
|
- .poll = vsock_poll,
|
|
|
+ .poll_mask = vsock_poll_mask,
|
|
|
.ioctl = sock_no_ioctl,
|
|
|
.listen = sock_no_listen,
|
|
|
.shutdown = vsock_shutdown,
|
|
@@ -1849,7 +1842,7 @@ static const struct proto_ops vsock_stream_ops = {
|
|
|
.socketpair = sock_no_socketpair,
|
|
|
.accept = vsock_accept,
|
|
|
.getname = vsock_getname,
|
|
|
- .poll = vsock_poll,
|
|
|
+ .poll_mask = vsock_poll_mask,
|
|
|
.ioctl = sock_no_ioctl,
|
|
|
.listen = vsock_listen,
|
|
|
.shutdown = vsock_shutdown,
|