public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-11-18 04:35:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net/dccp: convert to ->poll_mask

Browse source 
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Christoph Hellwig 2017-12-31 16:34:24 +01:00
parent db5051ead6
commit f4335f52bb
4 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/dccp/dccp.h
View file

@ -316,8 +316,7 @@ int dccp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,
int flags, int *addr_len); int flags, int *addr_len);
void dccp_shutdown(struct sock *sk, int how); void dccp_shutdown(struct sock *sk, int how);
int inet_dccp_listen(struct socket *sock, int backlog); int inet_dccp_listen(struct socket *sock, int backlog);
__poll_t dccp_poll(struct file *file, struct socket *sock, __poll_t dccp_poll_mask(struct socket *sock, __poll_t events);
poll_table *wait);
int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len); int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len);
void dccp_req_err(struct sock *sk, u64 seq); void dccp_req_err(struct sock *sk, u64 seq);

2
net/dccp/ipv4.c
View file

@ -984,7 +984,7 @@ static const struct proto_ops inet_dccp_ops = {
.accept = inet_accept, .accept = inet_accept,
.getname = inet_getname, .getname = inet_getname,
/* FIXME: work on tcp_poll to rename it to inet_csk_poll */ /* FIXME: work on tcp_poll to rename it to inet_csk_poll */
.poll = dccp_poll, .poll_mask = dccp_poll_mask,
.ioctl = inet_ioctl, .ioctl = inet_ioctl,
/* FIXME: work on inet_listen to rename it to sock_common_listen */ /* FIXME: work on inet_listen to rename it to sock_common_listen */
.listen = inet_dccp_listen, .listen = inet_dccp_listen,

2
net/dccp/ipv6.c
View file

@ -1070,7 +1070,7 @@ static const struct proto_ops inet6_dccp_ops = {
.socketpair = sock_no_socketpair, .socketpair = sock_no_socketpair,
.accept = inet_accept, .accept = inet_accept,
.getname = inet6_getname, .getname = inet6_getname,
.poll = dccp_poll, .poll_mask = dccp_poll_mask,
.ioctl = inet6_ioctl, .ioctl = inet6_ioctl,
.listen = inet_dccp_listen, .listen = inet_dccp_listen,
.shutdown = inet_shutdown, .shutdown = inet_shutdown,

13
net/dccp/proto.c
View file

@ -314,20 +314,11 @@ int dccp_disconnect(struct sock *sk, int flags)
EXPORT_SYMBOL_GPL(dccp_disconnect); EXPORT_SYMBOL_GPL(dccp_disconnect);
/* __poll_t dccp_poll_mask(struct socket *sock, __poll_t events)
* Wait for a DCCP event.
*
* Note that we don't need to lock the socket, as the upper poll layers
* take care of normal races (between the test and the event) and we don't
* go look at any of the socket buffers directly.
*/
__poll_t dccp_poll(struct file *file, struct socket *sock,
poll_table *wait)
{ {
__poll_t mask; __poll_t mask;
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
sock_poll_wait(file, sk_sleep(sk), wait);
if (sk->sk_state == DCCP_LISTEN) if (sk->sk_state == DCCP_LISTEN)
return inet_csk_listen_poll(sk); return inet_csk_listen_poll(sk);
@ -369,7 +360,7 @@ __poll_t dccp_poll(struct file *file, struct socket *sock,
return mask; return mask;
} }
EXPORT_SYMBOL_GPL(dccp_poll); EXPORT_SYMBOL_GPL(dccp_poll_mask);
int dccp_ioctl(struct sock *sk, int cmd, unsigned long arg) int dccp_ioctl(struct sock *sk, int cmd, unsigned long arg)
{ {