net: convert datagram_poll users tp ->poll_mask
Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
这个提交包含在:
@@ -1207,11 +1207,11 @@ static int dn_getname(struct socket *sock, struct sockaddr *uaddr,int peer)
|
||||
}
|
||||
|
||||
|
||||
static __poll_t dn_poll(struct file *file, struct socket *sock, poll_table *wait)
|
||||
static __poll_t dn_poll_mask(struct socket *sock, __poll_t events)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
struct dn_scp *scp = DN_SK(sk);
|
||||
__poll_t mask = datagram_poll(file, sock, wait);
|
||||
__poll_t mask = datagram_poll_mask(sock, events);
|
||||
|
||||
if (!skb_queue_empty(&scp->other_receive_queue))
|
||||
mask |= EPOLLRDBAND;
|
||||
@@ -2344,7 +2344,7 @@ static const struct proto_ops dn_proto_ops = {
|
||||
.socketpair = sock_no_socketpair,
|
||||
.accept = dn_accept,
|
||||
.getname = dn_getname,
|
||||
.poll = dn_poll,
|
||||
.poll_mask = dn_poll_mask,
|
||||
.ioctl = dn_ioctl,
|
||||
.listen = dn_listen,
|
||||
.shutdown = dn_shutdown,
|
||||
|
在新工单中引用
屏蔽一个用户