lkml.org 
[lkml]   [2018]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 22/32] net/bluetooth: convert to ->poll_mask
    Date
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    include/net/bluetooth/bluetooth.h | 2 +-
    net/bluetooth/af_bluetooth.c | 7 ++-----
    net/bluetooth/l2cap_sock.c | 2 +-
    net/bluetooth/rfcomm/sock.c | 2 +-
    net/bluetooth/sco.c | 2 +-
    5 files changed, 6 insertions(+), 9 deletions(-)

    diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
    index ec9d6bc65855..53ce8176c313 100644
    --- a/include/net/bluetooth/bluetooth.h
    +++ b/include/net/bluetooth/bluetooth.h
    @@ -271,7 +271,7 @@ int bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
    int flags);
    int bt_sock_stream_recvmsg(struct socket *sock, struct msghdr *msg,
    size_t len, int flags);
    -__poll_t bt_sock_poll(struct file *file, struct socket *sock, poll_table *wait);
    +__poll_t bt_sock_poll_mask(struct socket *sock, __poll_t events);
    int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
    int bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo);
    int bt_sock_wait_ready(struct sock *sk, unsigned long flags);
    diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
    index 84d92a077834..80033a7e1de2 100644
    --- a/net/bluetooth/af_bluetooth.c
    +++ b/net/bluetooth/af_bluetooth.c
    @@ -437,16 +437,13 @@ static inline __poll_t bt_accept_poll(struct sock *parent)
    return 0;
    }

    -__poll_t bt_sock_poll(struct file *file, struct socket *sock,
    - poll_table *wait)
    +__poll_t bt_sock_poll_mask(struct socket *sock, __poll_t events)
    {
    struct sock *sk = sock->sk;
    __poll_t mask = 0;

    BT_DBG("sock %p, sk %p", sock, sk);

    - poll_wait(file, sk_sleep(sk), wait);
    -
    if (sk->sk_state == BT_LISTEN)
    return bt_accept_poll(sk);

    @@ -478,7 +475,7 @@ __poll_t bt_sock_poll(struct file *file, struct socket *sock,

    return mask;
    }
    -EXPORT_SYMBOL(bt_sock_poll);
    +EXPORT_SYMBOL(bt_sock_poll_mask);

    int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
    {
    diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
    index 67a8642f57ea..d20b33daa80f 100644
    --- a/net/bluetooth/l2cap_sock.c
    +++ b/net/bluetooth/l2cap_sock.c
    @@ -1654,7 +1654,7 @@ static const struct proto_ops l2cap_sock_ops = {
    .getname = l2cap_sock_getname,
    .sendmsg = l2cap_sock_sendmsg,
    .recvmsg = l2cap_sock_recvmsg,
    - .poll = bt_sock_poll,
    + .poll_mask = bt_sock_poll_mask,
    .ioctl = bt_sock_ioctl,
    .mmap = sock_no_mmap,
    .socketpair = sock_no_socketpair,
    diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
    index 1aaccf637479..b4dc96481d92 100644
    --- a/net/bluetooth/rfcomm/sock.c
    +++ b/net/bluetooth/rfcomm/sock.c
    @@ -1049,7 +1049,7 @@ static const struct proto_ops rfcomm_sock_ops = {
    .setsockopt = rfcomm_sock_setsockopt,
    .getsockopt = rfcomm_sock_getsockopt,
    .ioctl = rfcomm_sock_ioctl,
    - .poll = bt_sock_poll,
    + .poll_mask = bt_sock_poll_mask,
    .socketpair = sock_no_socketpair,
    .mmap = sock_no_mmap
    };
    diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
    index 08df57665e1f..b2bf5c767b3e 100644
    --- a/net/bluetooth/sco.c
    +++ b/net/bluetooth/sco.c
    @@ -1198,7 +1198,7 @@ static const struct proto_ops sco_sock_ops = {
    .getname = sco_sock_getname,
    .sendmsg = sco_sock_sendmsg,
    .recvmsg = sco_sock_recvmsg,
    - .poll = bt_sock_poll,
    + .poll_mask = bt_sock_poll_mask,
    .ioctl = bt_sock_ioctl,
    .mmap = sock_no_mmap,
    .socketpair = sock_no_socketpair,
    --
    2.14.2
    \
     
     \ /
      Last update: 2018-03-30 17:43    [W:4.258 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site