Skip to content

Commit db5051e

Browse files
author
Christoph Hellwig
committed
net: convert datagram_poll users tp ->poll_mask
Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e76cd24 commit db5051e

File tree

31 files changed

+52
-59
lines changed

31 files changed

+52
-59
lines changed

‎drivers/isdn/mISDN/socket.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ static const struct proto_ops data_sock_ops = {
588588
.getname = data_sock_getname,
589589
.sendmsg = mISDN_sock_sendmsg,
590590
.recvmsg = mISDN_sock_recvmsg,
591-
.poll = datagram_poll,
591+
.poll_mask = datagram_poll_mask,
592592
.listen = sock_no_listen,
593593
.shutdown = sock_no_shutdown,
594594
.setsockopt = data_sock_setsockopt,

‎drivers/net/ppp/pppoe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1122,7 +1122,7 @@ static const struct proto_ops pppoe_ops = {
11221122
.socketpair = sock_no_socketpair,
11231123
.accept = sock_no_accept,
11241124
.getname = pppoe_getname,
1125-
.poll = datagram_poll,
1125+
.poll_mask = datagram_poll_mask,
11261126
.listen = sock_no_listen,
11271127
.shutdown = sock_no_shutdown,
11281128
.setsockopt = sock_no_setsockopt,

‎drivers/staging/ipx/af_ipx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1965,7 +1965,7 @@ static const struct proto_ops ipx_dgram_ops = {
19651965
.socketpair = sock_no_socketpair,
19661966
.accept = sock_no_accept,
19671967
.getname = ipx_getname,
1968-
.poll = datagram_poll,
1968+
.poll_mask = datagram_poll_mask,
19691969
.ioctl = ipx_ioctl,
19701970
#ifdef CONFIG_COMPAT
19711971
.compat_ioctl = ipx_compat_ioctl,

‎include/linux/skbuff.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3250,8 +3250,7 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned flags,
32503250
int *peeked, int *off, int *err);
32513251
struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
32523252
int *err);
3253-
__poll_t datagram_poll(struct file *file, struct socket *sock,
3254-
struct poll_table_struct *wait);
3253+
__poll_t datagram_poll_mask(struct socket *sock, __poll_t events);
32553254
int skb_copy_datagram_iter(const struct sk_buff *from, int offset,
32563255
struct iov_iter *to, int size);
32573256
static inline int skb_copy_datagram_msg(const struct sk_buff *from, int offset,

‎include/net/udp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ int udp_init_sock(struct sock *sk);
276276
int udp_pre_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len);
277277
int __udp_disconnect(struct sock *sk, int flags);
278278
int udp_disconnect(struct sock *sk, int flags);
279-
__poll_t udp_poll(struct file *file, struct socket *sock, poll_table *wait);
279+
__poll_t udp_poll_mask(struct socket *sock, __poll_t events);
280280
struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb,
281281
netdev_features_t features,
282282
bool is_ipv6);

‎net/appletalk/ddp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1869,7 +1869,7 @@ static const struct proto_ops atalk_dgram_ops = {
18691869
.socketpair = sock_no_socketpair,
18701870
.accept = sock_no_accept,
18711871
.getname = atalk_getname,
1872-
.poll = datagram_poll,
1872+
.poll_mask = datagram_poll_mask,
18731873
.ioctl = atalk_ioctl,
18741874
#ifdef CONFIG_COMPAT
18751875
.compat_ioctl = atalk_compat_ioctl,

‎net/ax25/af_ax25.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1954,7 +1954,7 @@ static const struct proto_ops ax25_proto_ops = {
19541954
.socketpair = sock_no_socketpair,
19551955
.accept = ax25_accept,
19561956
.getname = ax25_getname,
1957-
.poll = datagram_poll,
1957+
.poll_mask = datagram_poll_mask,
19581958
.ioctl = ax25_ioctl,
19591959
.listen = ax25_listen,
19601960
.shutdown = ax25_shutdown,

‎net/bluetooth/hci_sock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1975,7 +1975,7 @@ static const struct proto_ops hci_sock_ops = {
19751975
.sendmsg = hci_sock_sendmsg,
19761976
.recvmsg = hci_sock_recvmsg,
19771977
.ioctl = hci_sock_ioctl,
1978-
.poll = datagram_poll,
1978+
.poll_mask = datagram_poll_mask,
19791979
.listen = sock_no_listen,
19801980
.shutdown = sock_no_shutdown,
19811981
.setsockopt = hci_sock_setsockopt,

‎net/can/bcm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1669,7 +1669,7 @@ static const struct proto_ops bcm_ops = {
16691669
.socketpair = sock_no_socketpair,
16701670
.accept = sock_no_accept,
16711671
.getname = sock_no_getname,
1672-
.poll = datagram_poll,
1672+
.poll_mask = datagram_poll_mask,
16731673
.ioctl = can_ioctl, /* use can_ioctl() from af_can.c */
16741674
.listen = sock_no_listen,
16751675
.shutdown = sock_no_shutdown,

‎net/can/raw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,7 @@ static const struct proto_ops raw_ops = {
843843
.socketpair = sock_no_socketpair,
844844
.accept = sock_no_accept,
845845
.getname = raw_getname,
846-
.poll = datagram_poll,
846+
.poll_mask = datagram_poll_mask,
847847
.ioctl = can_ioctl, /* use can_ioctl() from af_can.c */
848848
.listen = sock_no_listen,
849849
.shutdown = sock_no_shutdown,

‎net/core/datagram.c

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -819,9 +819,8 @@ EXPORT_SYMBOL(skb_copy_and_csum_datagram_msg);
819819

820820
/**
821821
* datagram_poll - generic datagram poll
822-
* @file: file struct
823822
* @sock: socket
824-
* @wait: poll table
823+
* @events to wait for
825824
*
826825
* Datagram poll: Again totally generic. This also handles
827826
* sequenced packet sockets providing the socket receive queue
@@ -831,14 +830,10 @@ EXPORT_SYMBOL(skb_copy_and_csum_datagram_msg);
831830
* and you use a different write policy from sock_writeable()
832831
* then please supply your own write_space callback.
833832
*/
834-
__poll_t datagram_poll(struct file *file, struct socket *sock,
835-
poll_table *wait)
833+
__poll_t datagram_poll_mask(struct socket *sock, __poll_t events)
836834
{
837835
struct sock *sk = sock->sk;
838-
__poll_t mask;
839-
840-
sock_poll_wait(file, sk_sleep(sk), wait);
841-
mask = 0;
836+
__poll_t mask = 0;
842837

843838
/* exceptional events? */
844839
if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
@@ -871,4 +866,4 @@ __poll_t datagram_poll(struct file *file, struct socket *sock,
871866

872867
return mask;
873868
}
874-
EXPORT_SYMBOL(datagram_poll);
869+
EXPORT_SYMBOL(datagram_poll_mask);

‎net/decnet/af_decnet.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1207,11 +1207,11 @@ static int dn_getname(struct socket *sock, struct sockaddr *uaddr,int peer)
12071207
}
12081208

12091209

1210-
static __poll_t dn_poll(struct file *file, struct socket *sock, poll_table *wait)
1210+
static __poll_t dn_poll_mask(struct socket *sock, __poll_t events)
12111211
{
12121212
struct sock *sk = sock->sk;
12131213
struct dn_scp *scp = DN_SK(sk);
1214-
__poll_t mask = datagram_poll(file, sock, wait);
1214+
__poll_t mask = datagram_poll_mask(sock, events);
12151215

12161216
if (!skb_queue_empty(&scp->other_receive_queue))
12171217
mask |= EPOLLRDBAND;
@@ -2344,7 +2344,7 @@ static const struct proto_ops dn_proto_ops = {
23442344
.socketpair = sock_no_socketpair,
23452345
.accept = dn_accept,
23462346
.getname = dn_getname,
2347-
.poll = dn_poll,
2347+
.poll_mask = dn_poll_mask,
23482348
.ioctl = dn_ioctl,
23492349
.listen = dn_listen,
23502350
.shutdown = dn_shutdown,

‎net/ieee802154/socket.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ static const struct proto_ops ieee802154_raw_ops = {
423423
.socketpair = sock_no_socketpair,
424424
.accept = sock_no_accept,
425425
.getname = sock_no_getname,
426-
.poll = datagram_poll,
426+
.poll_mask = datagram_poll_mask,
427427
.ioctl = ieee802154_sock_ioctl,
428428
.listen = sock_no_listen,
429429
.shutdown = sock_no_shutdown,
@@ -969,7 +969,7 @@ static const struct proto_ops ieee802154_dgram_ops = {
969969
.socketpair = sock_no_socketpair,
970970
.accept = sock_no_accept,
971971
.getname = sock_no_getname,
972-
.poll = datagram_poll,
972+
.poll_mask = datagram_poll_mask,
973973
.ioctl = ieee802154_sock_ioctl,
974974
.listen = sock_no_listen,
975975
.shutdown = sock_no_shutdown,

‎net/ipv4/af_inet.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,7 +1018,7 @@ const struct proto_ops inet_dgram_ops = {
10181018
.socketpair = sock_no_socketpair,
10191019
.accept = sock_no_accept,
10201020
.getname = inet_getname,
1021-
.poll = udp_poll,
1021+
.poll_mask = udp_poll_mask,
10221022
.ioctl = inet_ioctl,
10231023
.listen = sock_no_listen,
10241024
.shutdown = inet_shutdown,
@@ -1039,7 +1039,7 @@ EXPORT_SYMBOL(inet_dgram_ops);
10391039

10401040
/*
10411041
* For SOCK_RAW sockets; should be the same as inet_dgram_ops but without
1042-
* udp_poll
1042+
* udp_poll_mask
10431043
*/
10441044
static const struct proto_ops inet_sockraw_ops = {
10451045
.family = PF_INET,
@@ -1050,7 +1050,7 @@ static const struct proto_ops inet_sockraw_ops = {
10501050
.socketpair = sock_no_socketpair,
10511051
.accept = sock_no_accept,
10521052
.getname = inet_getname,
1053-
.poll = datagram_poll,
1053+
.poll_mask = datagram_poll_mask,
10541054
.ioctl = inet_ioctl,
10551055
.listen = sock_no_listen,
10561056
.shutdown = inet_shutdown,

‎net/ipv4/udp.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2498,7 +2498,7 @@ int compat_udp_getsockopt(struct sock *sk, int level, int optname,
24982498
* udp_poll - wait for a UDP event.
24992499
* @file - file struct
25002500
* @sock - socket
2501-
* @wait - poll table
2501+
* @events - events to wait for
25022502
*
25032503
* This is same as datagram poll, except for the special case of
25042504
* blocking sockets. If application is using a blocking fd
@@ -2507,23 +2507,23 @@ int compat_udp_getsockopt(struct sock *sk, int level, int optname,
25072507
* but then block when reading it. Add special case code
25082508
* to work around these arguably broken applications.
25092509
*/
2510-
__poll_t udp_poll(struct file *file, struct socket *sock, poll_table *wait)
2510+
__poll_t udp_poll_mask(struct socket *sock, __poll_t events)
25112511
{
2512-
__poll_t mask = datagram_poll(file, sock, wait);
2512+
__poll_t mask = datagram_poll_mask(sock, events);
25132513
struct sock *sk = sock->sk;
25142514

25152515
if (!skb_queue_empty(&udp_sk(sk)->reader_queue))
25162516
mask |= EPOLLIN | EPOLLRDNORM;
25172517

25182518
/* Check for false positives due to checksum errors */
2519-
if ((mask & EPOLLRDNORM) && !(file->f_flags & O_NONBLOCK) &&
2519+
if ((mask & EPOLLRDNORM) && !(sock->file->f_flags & O_NONBLOCK) &&
25202520
!(sk->sk_shutdown & RCV_SHUTDOWN) && first_packet_length(sk) == -1)
25212521
mask &= ~(EPOLLIN | EPOLLRDNORM);
25222522

25232523
return mask;
25242524

25252525
}
2526-
EXPORT_SYMBOL(udp_poll);
2526+
EXPORT_SYMBOL(udp_poll_mask);
25272527

25282528
int udp_abort(struct sock *sk, int err)
25292529
{

‎net/ipv6/af_inet6.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ const struct proto_ops inet6_dgram_ops = {
601601
.socketpair = sock_no_socketpair, /* a do nothing */
602602
.accept = sock_no_accept, /* a do nothing */
603603
.getname = inet6_getname,
604-
.poll = udp_poll, /* ok */
604+
.poll_mask = udp_poll_mask, /* ok */
605605
.ioctl = inet6_ioctl, /* must change */
606606
.listen = sock_no_listen, /* ok */
607607
.shutdown = inet_shutdown, /* ok */

‎net/ipv6/raw.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1345,7 +1345,7 @@ void raw6_proc_exit(void)
13451345
}
13461346
#endif /* CONFIG_PROC_FS */
13471347

1348-
/* Same as inet6_dgram_ops, sans udp_poll. */
1348+
/* Same as inet6_dgram_ops, sans udp_poll_mask. */
13491349
const struct proto_ops inet6_sockraw_ops = {
13501350
.family = PF_INET6,
13511351
.owner = THIS_MODULE,
@@ -1355,7 +1355,7 @@ const struct proto_ops inet6_sockraw_ops = {
13551355
.socketpair = sock_no_socketpair, /* a do nothing */
13561356
.accept = sock_no_accept, /* a do nothing */
13571357
.getname = inet6_getname,
1358-
.poll = datagram_poll, /* ok */
1358+
.poll_mask = datagram_poll_mask, /* ok */
13591359
.ioctl = inet6_ioctl, /* must change */
13601360
.listen = sock_no_listen, /* ok */
13611361
.shutdown = inet_shutdown, /* ok */

‎net/kcm/kcmsock.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,9 +1336,9 @@ static void init_kcm_sock(struct kcm_sock *kcm, struct kcm_mux *mux)
13361336
struct list_head *head;
13371337
int index = 0;
13381338

1339-
/* For SOCK_SEQPACKET sock type, datagram_poll checks the sk_state, so
1340-
* we set sk_state, otherwise epoll_wait always returns right away with
1341-
* EPOLLHUP
1339+
/* For SOCK_SEQPACKET sock type, datagram_poll_mask checks the sk_state,
1340+
* so we set sk_state, otherwise epoll_wait always returns right away
1341+
* with EPOLLHUP
13421342
*/
13431343
kcm->sk.sk_state = TCP_ESTABLISHED;
13441344

@@ -1903,7 +1903,7 @@ static const struct proto_ops kcm_dgram_ops = {
19031903
.socketpair = sock_no_socketpair,
19041904
.accept = sock_no_accept,
19051905
.getname = sock_no_getname,
1906-
.poll = datagram_poll,
1906+
.poll_mask = datagram_poll_mask,
19071907
.ioctl = kcm_ioctl,
19081908
.listen = sock_no_listen,
19091909
.shutdown = sock_no_shutdown,
@@ -1924,7 +1924,7 @@ static const struct proto_ops kcm_seqpacket_ops = {
19241924
.socketpair = sock_no_socketpair,
19251925
.accept = sock_no_accept,
19261926
.getname = sock_no_getname,
1927-
.poll = datagram_poll,
1927+
.poll_mask = datagram_poll_mask,
19281928
.ioctl = kcm_ioctl,
19291929
.listen = sock_no_listen,
19301930
.shutdown = sock_no_shutdown,

‎net/key/af_key.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3726,7 +3726,7 @@ static const struct proto_ops pfkey_ops = {
37263726

37273727
/* Now the operations that really occur. */
37283728
.release = pfkey_release,
3729-
.poll = datagram_poll,
3729+
.poll_mask = datagram_poll_mask,
37303730
.sendmsg = pfkey_sendmsg,
37313731
.recvmsg = pfkey_recvmsg,
37323732
};

‎net/l2tp/l2tp_ip.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ static const struct proto_ops l2tp_ip_ops = {
613613
.socketpair = sock_no_socketpair,
614614
.accept = sock_no_accept,
615615
.getname = l2tp_ip_getname,
616-
.poll = datagram_poll,
616+
.poll_mask = datagram_poll_mask,
617617
.ioctl = inet_ioctl,
618618
.listen = sock_no_listen,
619619
.shutdown = inet_shutdown,

‎net/l2tp/l2tp_ip6.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ static const struct proto_ops l2tp_ip6_ops = {
754754
.socketpair = sock_no_socketpair,
755755
.accept = sock_no_accept,
756756
.getname = l2tp_ip6_getname,
757-
.poll = datagram_poll,
757+
.poll_mask = datagram_poll_mask,
758758
.ioctl = inet6_ioctl,
759759
.listen = sock_no_listen,
760760
.shutdown = inet_shutdown,

‎net/l2tp/l2tp_ppp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1806,7 +1806,7 @@ static const struct proto_ops pppol2tp_ops = {
18061806
.socketpair = sock_no_socketpair,
18071807
.accept = sock_no_accept,
18081808
.getname = pppol2tp_getname,
1809-
.poll = datagram_poll,
1809+
.poll_mask = datagram_poll_mask,
18101810
.listen = sock_no_listen,
18111811
.shutdown = sock_no_shutdown,
18121812
.setsockopt = pppol2tp_setsockopt,

‎net/llc/af_llc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1189,7 +1189,7 @@ static const struct proto_ops llc_ui_ops = {
11891189
.socketpair = sock_no_socketpair,
11901190
.accept = llc_ui_accept,
11911191
.getname = llc_ui_getname,
1192-
.poll = datagram_poll,
1192+
.poll_mask = datagram_poll_mask,
11931193
.ioctl = llc_ui_ioctl,
11941194
.listen = llc_ui_listen,
11951195
.shutdown = llc_ui_shutdown,

‎net/netlink/af_netlink.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2673,7 +2673,7 @@ static const struct proto_ops netlink_ops = {
26732673
.socketpair = sock_no_socketpair,
26742674
.accept = sock_no_accept,
26752675
.getname = netlink_getname,
2676-
.poll = datagram_poll,
2676+
.poll_mask = datagram_poll_mask,
26772677
.ioctl = netlink_ioctl,
26782678
.listen = sock_no_listen,
26792679
.shutdown = sock_no_shutdown,

‎net/netrom/af_netrom.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1367,7 +1367,7 @@ static const struct proto_ops nr_proto_ops = {
13671367
.socketpair = sock_no_socketpair,
13681368
.accept = nr_accept,
13691369
.getname = nr_getname,
1370-
.poll = datagram_poll,
1370+
.poll_mask = datagram_poll_mask,
13711371
.ioctl = nr_ioctl,
13721372
.listen = nr_listen,
13731373
.shutdown = sock_no_shutdown,

‎net/nfc/rawsock.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ static const struct proto_ops rawsock_ops = {
284284
.socketpair = sock_no_socketpair,
285285
.accept = sock_no_accept,
286286
.getname = sock_no_getname,
287-
.poll = datagram_poll,
287+
.poll_mask = datagram_poll_mask,
288288
.ioctl = sock_no_ioctl,
289289
.listen = sock_no_listen,
290290
.shutdown = sock_no_shutdown,
@@ -304,7 +304,7 @@ static const struct proto_ops rawsock_raw_ops = {
304304
.socketpair = sock_no_socketpair,
305305
.accept = sock_no_accept,
306306
.getname = sock_no_getname,
307-
.poll = datagram_poll,
307+
.poll_mask = datagram_poll_mask,
308308
.ioctl = sock_no_ioctl,
309309
.listen = sock_no_listen,
310310
.shutdown = sock_no_shutdown,

0 commit comments

Comments
 (0)