Commit 4df7338f authored by Christoph Hellwig's avatar Christoph Hellwig

net/tipc: convert to ->poll_mask

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 31f50b55
...@@ -692,10 +692,9 @@ static int tipc_getname(struct socket *sock, struct sockaddr *uaddr, ...@@ -692,10 +692,9 @@ static int tipc_getname(struct socket *sock, struct sockaddr *uaddr,
} }
/** /**
* tipc_poll - read and possibly block on pollmask * tipc_poll - read pollmask
* @file: file structure associated with the socket * @file: file structure associated with the socket
* @sock: socket for which to calculate the poll bits * @sock: socket for which to calculate the poll bits
* @wait: ???
* *
* Returns pollmask value * Returns pollmask value
* *
...@@ -709,15 +708,12 @@ static int tipc_getname(struct socket *sock, struct sockaddr *uaddr, ...@@ -709,15 +708,12 @@ static int tipc_getname(struct socket *sock, struct sockaddr *uaddr,
* imply that the operation will succeed, merely that it should be performed * imply that the operation will succeed, merely that it should be performed
* and will not block. * and will not block.
*/ */
static __poll_t tipc_poll(struct file *file, struct socket *sock, static __poll_t tipc_poll_mask(struct socket *sock, __poll_t events)
poll_table *wait)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
struct tipc_sock *tsk = tipc_sk(sk); struct tipc_sock *tsk = tipc_sk(sk);
__poll_t revents = 0; __poll_t revents = 0;
sock_poll_wait(file, sk_sleep(sk), wait);
if (sk->sk_shutdown & RCV_SHUTDOWN) if (sk->sk_shutdown & RCV_SHUTDOWN)
revents |= EPOLLRDHUP | EPOLLIN | EPOLLRDNORM; revents |= EPOLLRDHUP | EPOLLIN | EPOLLRDNORM;
if (sk->sk_shutdown == SHUTDOWN_MASK) if (sk->sk_shutdown == SHUTDOWN_MASK)
...@@ -3027,7 +3023,7 @@ static const struct proto_ops msg_ops = { ...@@ -3027,7 +3023,7 @@ static const struct proto_ops msg_ops = {
.socketpair = tipc_socketpair, .socketpair = tipc_socketpair,
.accept = sock_no_accept, .accept = sock_no_accept,
.getname = tipc_getname, .getname = tipc_getname,
.poll = tipc_poll, .poll_mask = tipc_poll_mask,
.ioctl = tipc_ioctl, .ioctl = tipc_ioctl,
.listen = sock_no_listen, .listen = sock_no_listen,
.shutdown = tipc_shutdown, .shutdown = tipc_shutdown,
...@@ -3048,7 +3044,7 @@ static const struct proto_ops packet_ops = { ...@@ -3048,7 +3044,7 @@ static const struct proto_ops packet_ops = {
.socketpair = tipc_socketpair, .socketpair = tipc_socketpair,
.accept = tipc_accept, .accept = tipc_accept,
.getname = tipc_getname, .getname = tipc_getname,
.poll = tipc_poll, .poll_mask = tipc_poll_mask,
.ioctl = tipc_ioctl, .ioctl = tipc_ioctl,
.listen = tipc_listen, .listen = tipc_listen,
.shutdown = tipc_shutdown, .shutdown = tipc_shutdown,
...@@ -3069,7 +3065,7 @@ static const struct proto_ops stream_ops = { ...@@ -3069,7 +3065,7 @@ static const struct proto_ops stream_ops = {
.socketpair = tipc_socketpair, .socketpair = tipc_socketpair,
.accept = tipc_accept, .accept = tipc_accept,
.getname = tipc_getname, .getname = tipc_getname,
.poll = tipc_poll, .poll_mask = tipc_poll_mask,
.ioctl = tipc_ioctl, .ioctl = tipc_ioctl,
.listen = tipc_listen, .listen = tipc_listen,
.shutdown = tipc_shutdown, .shutdown = tipc_shutdown,
......
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