mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

net/unix: convert to ->poll_mask

Browse source 
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Christoph Hellwig 2018-04-09 15:27:21 +02:00
parent 2c7d3daceb
commit e76cd24d02
1 changed files with 11 additions and 19 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

30
net/unix/af_unix.c
View file

@ -638,9 +638,8 @@ static int unix_stream_connect(struct socket *, struct sockaddr *,
static int unix_socketpair(struct socket *, struct socket *); static int unix_socketpair(struct socket *, struct socket *);
static int unix_accept(struct socket *, struct socket *, int, bool); static int unix_accept(struct socket *, struct socket *, int, bool);
static int unix_getname(struct socket *, struct sockaddr *, int); static int unix_getname(struct socket *, struct sockaddr *, int);
static __poll_t unix_poll(struct file *, struct socket *, poll_table *); static __poll_t unix_poll_mask(struct socket *, __poll_t);
static __poll_t unix_dgram_poll(struct file *, struct socket *, static __poll_t unix_dgram_poll_mask(struct socket *, __poll_t);
poll_table *);
static int unix_ioctl(struct socket *, unsigned int, unsigned long); static int unix_ioctl(struct socket *, unsigned int, unsigned long);
static int unix_shutdown(struct socket *, int); static int unix_shutdown(struct socket *, int);
static int unix_stream_sendmsg(struct socket *, struct msghdr *, size_t); static int unix_stream_sendmsg(struct socket *, struct msghdr *, size_t);
@ -681,7 +680,7 @@ static const struct proto_ops unix_stream_ops = {
.socketpair = unix_socketpair, .socketpair = unix_socketpair,
.accept = unix_accept, .accept = unix_accept,
.getname = unix_getname, .getname = unix_getname,
.poll = unix_poll, .poll_mask = unix_poll_mask,
.ioctl = unix_ioctl, .ioctl = unix_ioctl,
.listen = unix_listen, .listen = unix_listen,
.shutdown = unix_shutdown, .shutdown = unix_shutdown,
@ -704,7 +703,7 @@ static const struct proto_ops unix_dgram_ops = {
.socketpair = unix_socketpair, .socketpair = unix_socketpair,
.accept = sock_no_accept, .accept = sock_no_accept,
.getname = unix_getname, .getname = unix_getname,
.poll = unix_dgram_poll, .poll_mask = unix_dgram_poll_mask,
.ioctl = unix_ioctl, .ioctl = unix_ioctl,
.listen = sock_no_listen, .listen = sock_no_listen,
.shutdown = unix_shutdown, .shutdown = unix_shutdown,
@ -726,7 +725,7 @@ static const struct proto_ops unix_seqpacket_ops = {
.socketpair = unix_socketpair, .socketpair = unix_socketpair,
.accept = unix_accept, .accept = unix_accept,
.getname = unix_getname, .getname = unix_getname,
.poll = unix_dgram_poll, .poll_mask = unix_dgram_poll_mask,
.ioctl = unix_ioctl, .ioctl = unix_ioctl,
.listen = unix_listen, .listen = unix_listen,
.shutdown = unix_shutdown, .shutdown = unix_shutdown,
@ -2630,13 +2629,10 @@ static int unix_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
return err; return err;
} }
static __poll_t unix_poll(struct file *file, struct socket *sock, poll_table *wait) static __poll_t unix_poll_mask(struct socket *sock, __poll_t events)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
__poll_t mask; __poll_t mask = 0;
sock_poll_wait(file, sk_sleep(sk), wait);
mask = 0;
/* exceptional events? */ /* exceptional events? */
if (sk->sk_err) if (sk->sk_err)
@ -2665,15 +2661,11 @@ static __poll_t unix_poll(struct file *file, struct socket *sock, poll_table *wa
return mask; return mask;
} }
static __poll_t unix_dgram_poll(struct file *file, struct socket *sock, static __poll_t unix_dgram_poll_mask(struct socket *sock, __poll_t events)
poll_table *wait)
{ {
struct sock *sk = sock->sk, *other; struct sock *sk = sock->sk, *other;
unsigned int writable; int writable;
__poll_t mask; __poll_t mask = 0;
sock_poll_wait(file, sk_sleep(sk), wait);
mask = 0;
/* exceptional events? */ /* exceptional events? */
if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
@ -2699,7 +2691,7 @@ static __poll_t unix_dgram_poll(struct file *file, struct socket *sock,
} }
/* No write status requested, avoid expensive OUT tests. */ /* No write status requested, avoid expensive OUT tests. */
if (!(poll_requested_events(wait) & (EPOLLWRBAND|EPOLLWRNORM|EPOLLOUT))) if (!(events & (EPOLLWRBAND|EPOLLWRNORM|EPOLLOUT)))
return mask; return mask;
writable = unix_writable(sk); writable = unix_writable(sk);