lkml.org 
[lkml]   [2018]   [Jan]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 13/31] net/sctp: convert to ->poll_mask
    Date
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    include/net/sctp/sctp.h | 4 ++--
    net/sctp/ipv6.c | 2 +-
    net/sctp/protocol.c | 2 +-
    net/sctp/socket.c | 4 +---
    4 files changed, 5 insertions(+), 7 deletions(-)

    diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
    index 608d123ef25f..b378d978d272 100644
    --- a/include/net/sctp/sctp.h
    +++ b/include/net/sctp/sctp.h
    @@ -107,8 +107,8 @@ int sctp_backlog_rcv(struct sock *sk, struct sk_buff *skb);
    int sctp_inet_listen(struct socket *sock, int backlog);
    void sctp_write_space(struct sock *sk);
    void sctp_data_ready(struct sock *sk);
    -__poll_t sctp_poll(struct file *file, struct socket *sock,
    - poll_table *wait);
    +__poll_t sctp_poll_mask(struct file *file, struct socket *sock,
    + __poll_t events);
    void sctp_sock_rfree(struct sk_buff *skb);
    void sctp_copy_sock(struct sock *newsk, struct sock *sk,
    struct sctp_association *asoc);
    diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
    index 3b18085e3b10..aa1261216b51 100644
    --- a/net/sctp/ipv6.c
    +++ b/net/sctp/ipv6.c
    @@ -971,7 +971,7 @@ static const struct proto_ops inet6_seqpacket_ops = {
    .socketpair = sock_no_socketpair,
    .accept = inet_accept,
    .getname = sctp_getname,
    - .poll = sctp_poll,
    + .poll_mask = sctp_poll_mask,
    .ioctl = inet6_ioctl,
    .listen = sctp_inet_listen,
    .shutdown = inet_shutdown,
    diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
    index 6a38c2503649..13b7daafcca7 100644
    --- a/net/sctp/protocol.c
    +++ b/net/sctp/protocol.c
    @@ -1026,7 +1026,7 @@ static const struct proto_ops inet_seqpacket_ops = {
    .socketpair = sock_no_socketpair,
    .accept = inet_accept,
    .getname = inet_getname, /* Semantics are different. */
    - .poll = sctp_poll,
    + .poll_mask = sctp_poll_mask,
    .ioctl = inet_ioctl,
    .listen = sctp_inet_listen,
    .shutdown = inet_shutdown, /* Looks harmless. */
    diff --git a/net/sctp/socket.c b/net/sctp/socket.c
    index 03d9d24b38ba..1f3392d6cb6d 100644
    --- a/net/sctp/socket.c
    +++ b/net/sctp/socket.c
    @@ -7500,14 +7500,12 @@ int sctp_inet_listen(struct socket *sock, int backlog)
    * here, again, by modeling the current TCP/UDP code. We don't have
    * a good way to test with it yet.
    */
    -__poll_t sctp_poll(struct file *file, struct socket *sock, poll_table *wait)
    +__poll_t sctp_poll_mask(struct file *file, struct socket *sock, __poll_t events)
    {
    struct sock *sk = sock->sk;
    struct sctp_sock *sp = sctp_sk(sk);
    __poll_t mask;

    - poll_wait(file, sk_sleep(sk), wait);
    -
    sock_rps_record_flow(sk);

    /* A TCP-style listening socket becomes readable when the accept queue
    --
    2.14.2
    \
     
     \ /
      Last update: 2018-01-04 09:13    [W:2.351 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site