From: Christoph Hellwig <hch@lst.de>
To: viro@zeniv.linux.org.uk
Cc: Avi Kivity <avi@scylladb.com>,
linux-aio@kvack.org, linux-fsdevel@vger.kernel.org,
netdev@vger.kernel.org, linux-api@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 22/32] net/bluetooth: convert to ->poll_mask
Date: Fri, 30 Mar 2018 17:07:59 +0200 [thread overview]
Message-ID: <20180330150809.28094-23-hch@lst.de> (raw)
In-Reply-To: <20180330150809.28094-1-hch@lst.de>
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
next prev parent reply other threads:[~2018-03-30 15:07 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-30 15:07 aio poll and a new in-kernel poll API V9 Christoph Hellwig
2018-03-30 15:07 ` [PATCH 01/32] fs: unexport poll_schedule_timeout Christoph Hellwig
2018-03-30 15:07 ` [PATCH 02/32] fs: cleanup do_pollfd Christoph Hellwig
2018-03-30 15:07 ` [PATCH 03/32] fs: update documentation to mention __poll_t and match the code Christoph Hellwig
2018-03-30 15:07 ` [PATCH 04/32] fs: add new vfs_poll and file_can_poll helpers Christoph Hellwig
2018-03-30 15:07 ` [PATCH 05/32] fs: introduce new ->get_poll_head and ->poll_mask methods Christoph Hellwig
2018-04-06 4:58 ` Al Viro
2018-03-30 15:07 ` [PATCH 06/32] aio: simplify KIOCB_KEY handling Christoph Hellwig
2018-03-30 15:07 ` [PATCH 07/32] aio: simplify cancellation Christoph Hellwig
2018-03-30 15:07 ` [PATCH 08/32] aio: replace kiocb_set_cancel_fn with a cancel_kiocb file operation Christoph Hellwig
2018-04-06 2:15 ` Al Viro
2018-03-30 15:07 ` [PATCH 09/32] aio: add delayed cancel support Christoph Hellwig
2018-03-30 15:07 ` [PATCH 10/32] aio: implement IOCB_CMD_POLL Christoph Hellwig
2018-03-30 15:07 ` [PATCH 11/32] net: refactor socket_poll Christoph Hellwig
2018-03-30 15:07 ` [PATCH 12/32] net: add support for ->poll_mask in proto_ops Christoph Hellwig
2018-03-30 15:07 ` [PATCH 13/32] net: remove sock_no_poll Christoph Hellwig
2018-03-30 15:07 ` [PATCH 14/32] net/tcp: convert to ->poll_mask Christoph Hellwig
2018-03-30 15:07 ` [PATCH 15/32] net/unix: " Christoph Hellwig
2018-03-30 15:07 ` [PATCH 16/32] net: convert datagram_poll users tp ->poll_mask Christoph Hellwig
2018-03-30 15:07 ` [PATCH 17/32] net/dccp: convert to ->poll_mask Christoph Hellwig
2018-03-30 15:07 ` [PATCH 18/32] net/atm: " Christoph Hellwig
2018-03-30 15:07 ` [PATCH 19/32] net/vmw_vsock: " Christoph Hellwig
2018-03-30 15:07 ` [PATCH 20/32] net/tipc: " Christoph Hellwig
2018-03-30 15:07 ` [PATCH 21/32] net/sctp: " Christoph Hellwig
2018-03-30 15:07 ` Christoph Hellwig [this message]
2018-03-30 15:08 ` [PATCH 23/32] net/caif: " Christoph Hellwig
2018-03-30 15:08 ` [PATCH 24/32] net/nfc: " Christoph Hellwig
2018-03-30 15:08 ` [PATCH 25/32] net/phonet: " Christoph Hellwig
2018-03-30 15:08 ` [PATCH 26/32] net/iucv: " Christoph Hellwig
2018-03-30 15:08 ` [PATCH 27/32] net/rxrpc: " Christoph Hellwig
2018-03-30 15:08 ` [PATCH 28/32] crypto: af_alg: " Christoph Hellwig
2018-03-30 15:08 ` [PATCH 29/32] pipe: " Christoph Hellwig
2018-03-30 15:08 ` [PATCH 30/32] eventfd: switch " Christoph Hellwig
2018-03-30 15:08 ` [PATCH 31/32] timerfd: convert " Christoph Hellwig
2018-03-30 15:08 ` [PATCH 32/32] random: " Christoph Hellwig
2018-05-11 11:07 aio poll and a new in-kernel poll API V10 Christoph Hellwig
2018-05-11 11:07 ` [PATCH 22/32] net/bluetooth: convert to ->poll_mask Christoph Hellwig
2018-05-15 19:48 aio poll and a new in-kernel poll API V11 Christoph Hellwig
2018-05-15 19:48 ` [PATCH 22/32] net/bluetooth: convert to ->poll_mask Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180330150809.28094-23-hch@lst.de \
--to=hch@lst.de \
--cc=avi@scylladb.com \
--cc=linux-aio@kvack.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).