openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net/vmw_vsock: convert to ->poll_mask 

Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Christoph Hellwig 2017-12-31 16:35:54 +01:00
parent 9f728af35f
commit 31f50b5573
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
net/vmw_vsock/af_vsock.c
View File

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