mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
net/tipc: convert to ->poll_mask
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
parent
31f50b5573
commit
4df7338f6f
1 changed files with 5 additions and 9 deletions
|
@ -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
|
||||
* @sock: socket for which to calculate the poll bits
|
||||
* @wait: ???
|
||||
*
|
||||
* Returns pollmask value
|
||||
*
|
||||
|
@ -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
|
||||
* and will not block.
|
||||
*/
|
||||
static __poll_t tipc_poll(struct file *file, struct socket *sock,
|
||||
poll_table *wait)
|
||||
static __poll_t tipc_poll_mask(struct socket *sock, __poll_t events)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
struct tipc_sock *tsk = tipc_sk(sk);
|
||||
__poll_t revents = 0;
|
||||
|
||||
sock_poll_wait(file, sk_sleep(sk), wait);
|
||||
|
||||
if (sk->sk_shutdown & RCV_SHUTDOWN)
|
||||
revents |= EPOLLRDHUP | EPOLLIN | EPOLLRDNORM;
|
||||
if (sk->sk_shutdown == SHUTDOWN_MASK)
|
||||
|
@ -3027,7 +3023,7 @@ static const struct proto_ops msg_ops = {
|
|||
.socketpair = tipc_socketpair,
|
||||
.accept = sock_no_accept,
|
||||
.getname = tipc_getname,
|
||||
.poll = tipc_poll,
|
||||
.poll_mask = tipc_poll_mask,
|
||||
.ioctl = tipc_ioctl,
|
||||
.listen = sock_no_listen,
|
||||
.shutdown = tipc_shutdown,
|
||||
|
@ -3048,7 +3044,7 @@ static const struct proto_ops packet_ops = {
|
|||
.socketpair = tipc_socketpair,
|
||||
.accept = tipc_accept,
|
||||
.getname = tipc_getname,
|
||||
.poll = tipc_poll,
|
||||
.poll_mask = tipc_poll_mask,
|
||||
.ioctl = tipc_ioctl,
|
||||
.listen = tipc_listen,
|
||||
.shutdown = tipc_shutdown,
|
||||
|
@ -3069,7 +3065,7 @@ static const struct proto_ops stream_ops = {
|
|||
.socketpair = tipc_socketpair,
|
||||
.accept = tipc_accept,
|
||||
.getname = tipc_getname,
|
||||
.poll = tipc_poll,
|
||||
.poll_mask = tipc_poll_mask,
|
||||
.ioctl = tipc_ioctl,
|
||||
.listen = tipc_listen,
|
||||
.shutdown = tipc_shutdown,
|
||||
|
|
Loading…
Reference in a new issue