lkml.org 
[lkml]   [2018]   [Jan]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 22/36] net/atm: convert to ->poll_mask
    Date
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    net/atm/common.c | 11 +++--------
    net/atm/common.h | 2 +-
    net/atm/pvc.c | 2 +-
    net/atm/svc.c | 2 +-
    4 files changed, 6 insertions(+), 11 deletions(-)

    diff --git a/net/atm/common.c b/net/atm/common.c
    index 8f12f1c6fa14..07223ef2a220 100644
    --- a/net/atm/common.c
    +++ b/net/atm/common.c
    @@ -648,16 +648,11 @@ int vcc_sendmsg(struct socket *sock, struct msghdr *m, size_t size)
    return error;
    }

    -__poll_t vcc_poll(struct file *file, struct socket *sock, poll_table *wait)
    +__poll_t vcc_poll_mask(struct socket *sock, __poll_t events)
    {
    struct sock *sk = sock->sk;
    - struct atm_vcc *vcc;
    - __poll_t mask;
    -
    - sock_poll_wait(file, sk_sleep(sk), wait);
    - mask = 0;
    -
    - vcc = ATM_SD(sock);
    + struct atm_vcc *vcc = ATM_SD(sock);
    + __poll_t mask = 0;

    /* exceptional events */
    if (sk->sk_err)
    diff --git a/net/atm/common.h b/net/atm/common.h
    index 5850649068bb..526796ad230f 100644
    --- a/net/atm/common.h
    +++ b/net/atm/common.h
    @@ -17,7 +17,7 @@ int vcc_connect(struct socket *sock, int itf, short vpi, int vci);
    int vcc_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
    int flags);
    int vcc_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len);
    -__poll_t vcc_poll(struct file *file, struct socket *sock, poll_table *wait);
    +__poll_t vcc_poll_mask(struct socket *sock, __poll_t events);
    int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
    int vcc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
    int vcc_setsockopt(struct socket *sock, int level, int optname,
    diff --git a/net/atm/pvc.c b/net/atm/pvc.c
    index e1140b3bdcaa..930651c5e77c 100644
    --- a/net/atm/pvc.c
    +++ b/net/atm/pvc.c
    @@ -114,7 +114,7 @@ static const struct proto_ops pvc_proto_ops = {
    .socketpair = sock_no_socketpair,
    .accept = sock_no_accept,
    .getname = pvc_getname,
    - .poll = vcc_poll,
    + .poll_mask = vcc_poll_mask,
    .ioctl = vcc_ioctl,
    #ifdef CONFIG_COMPAT
    .compat_ioctl = vcc_compat_ioctl,
    diff --git a/net/atm/svc.c b/net/atm/svc.c
    index c458adcbc177..ad0e6ffb9cfe 100644
    --- a/net/atm/svc.c
    +++ b/net/atm/svc.c
    @@ -637,7 +637,7 @@ static const struct proto_ops svc_proto_ops = {
    .socketpair = sock_no_socketpair,
    .accept = svc_accept,
    .getname = svc_getname,
    - .poll = vcc_poll,
    + .poll_mask = vcc_poll_mask,
    .ioctl = svc_ioctl,
    #ifdef CONFIG_COMPAT
    .compat_ioctl = svc_compat_ioctl,
    --
    2.14.2
    \
     
     \ /
      Last update: 2018-01-18 00:21    [W:4.087 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site