linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 14/33] net: remove sock_no_poll
Date: Wed, 23 May 2018 21:20:03 +0200	[thread overview]
Message-ID: <20180523192022.1703-15-hch@lst.de> (raw)
In-Reply-To: <20180523192022.1703-1-hch@lst.de>

Now that sock_poll handles a NULL ->poll or ->poll_mask there is no need
for a stub.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 crypto/af_alg.c             | 1 -
 crypto/algif_hash.c         | 2 --
 crypto/algif_rng.c          | 1 -
 drivers/isdn/mISDN/socket.c | 1 -
 drivers/net/ppp/pptp.c      | 1 -
 include/net/sock.h          | 2 --
 net/bluetooth/bnep/sock.c   | 1 -
 net/bluetooth/cmtp/sock.c   | 1 -
 net/bluetooth/hidp/sock.c   | 1 -
 net/core/sock.c             | 6 ------
 10 files changed, 17 deletions(-)

diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index 7846c0c20cfe..80838c1cef94 100644
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -347,7 +347,6 @@ static const struct proto_ops alg_proto_ops = {
 	.sendpage	=	sock_no_sendpage,
 	.sendmsg	=	sock_no_sendmsg,
 	.recvmsg	=	sock_no_recvmsg,
-	.poll		=	sock_no_poll,
 
 	.bind		=	alg_bind,
 	.release	=	af_alg_release,
diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c
index 6c9b1927a520..bfcf595fd8f9 100644
--- a/crypto/algif_hash.c
+++ b/crypto/algif_hash.c
@@ -288,7 +288,6 @@ static struct proto_ops algif_hash_ops = {
 	.mmap		=	sock_no_mmap,
 	.bind		=	sock_no_bind,
 	.setsockopt	=	sock_no_setsockopt,
-	.poll		=	sock_no_poll,
 
 	.release	=	af_alg_release,
 	.sendmsg	=	hash_sendmsg,
@@ -396,7 +395,6 @@ static struct proto_ops algif_hash_ops_nokey = {
 	.mmap		=	sock_no_mmap,
 	.bind		=	sock_no_bind,
 	.setsockopt	=	sock_no_setsockopt,
-	.poll		=	sock_no_poll,
 
 	.release	=	af_alg_release,
 	.sendmsg	=	hash_sendmsg_nokey,
diff --git a/crypto/algif_rng.c b/crypto/algif_rng.c
index 150c2b6480ed..22df3799a17b 100644
--- a/crypto/algif_rng.c
+++ b/crypto/algif_rng.c
@@ -106,7 +106,6 @@ static struct proto_ops algif_rng_ops = {
 	.bind		=	sock_no_bind,
 	.accept		=	sock_no_accept,
 	.setsockopt	=	sock_no_setsockopt,
-	.poll		=	sock_no_poll,
 	.sendmsg	=	sock_no_sendmsg,
 	.sendpage	=	sock_no_sendpage,
 
diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
index 1f8f489b4167..18c0a1281914 100644
--- a/drivers/isdn/mISDN/socket.c
+++ b/drivers/isdn/mISDN/socket.c
@@ -745,7 +745,6 @@ static const struct proto_ops base_sock_ops = {
 	.getname	= sock_no_getname,
 	.sendmsg	= sock_no_sendmsg,
 	.recvmsg	= sock_no_recvmsg,
-	.poll		= sock_no_poll,
 	.listen		= sock_no_listen,
 	.shutdown	= sock_no_shutdown,
 	.setsockopt	= sock_no_setsockopt,
diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c
index c4267ecefd85..157b67c1bf8e 100644
--- a/drivers/net/ppp/pptp.c
+++ b/drivers/net/ppp/pptp.c
@@ -624,7 +624,6 @@ static const struct proto_ops pptp_ops = {
 	.socketpair = sock_no_socketpair,
 	.accept     = sock_no_accept,
 	.getname    = pptp_getname,
-	.poll       = sock_no_poll,
 	.listen     = sock_no_listen,
 	.shutdown   = sock_no_shutdown,
 	.setsockopt = sock_no_setsockopt,
diff --git a/include/net/sock.h b/include/net/sock.h
index 74d725fdbe0f..4d2e8ad98985 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1591,8 +1591,6 @@ int sock_no_connect(struct socket *, struct sockaddr *, int, int);
 int sock_no_socketpair(struct socket *, struct socket *);
 int sock_no_accept(struct socket *, struct socket *, int, bool);
 int sock_no_getname(struct socket *, struct sockaddr *, int);
-__poll_t sock_no_poll(struct file *, struct socket *,
-			  struct poll_table_struct *);
 int sock_no_ioctl(struct socket *, unsigned int, unsigned long);
 int sock_no_listen(struct socket *, int);
 int sock_no_shutdown(struct socket *, int);
diff --git a/net/bluetooth/bnep/sock.c b/net/bluetooth/bnep/sock.c
index b5116fa9835e..00deacdcb51c 100644
--- a/net/bluetooth/bnep/sock.c
+++ b/net/bluetooth/bnep/sock.c
@@ -175,7 +175,6 @@ static const struct proto_ops bnep_sock_ops = {
 	.getname	= sock_no_getname,
 	.sendmsg	= sock_no_sendmsg,
 	.recvmsg	= sock_no_recvmsg,
-	.poll		= sock_no_poll,
 	.listen		= sock_no_listen,
 	.shutdown	= sock_no_shutdown,
 	.setsockopt	= sock_no_setsockopt,
diff --git a/net/bluetooth/cmtp/sock.c b/net/bluetooth/cmtp/sock.c
index ce86a7bae844..e08f28fadd65 100644
--- a/net/bluetooth/cmtp/sock.c
+++ b/net/bluetooth/cmtp/sock.c
@@ -178,7 +178,6 @@ static const struct proto_ops cmtp_sock_ops = {
 	.getname	= sock_no_getname,
 	.sendmsg	= sock_no_sendmsg,
 	.recvmsg	= sock_no_recvmsg,
-	.poll		= sock_no_poll,
 	.listen		= sock_no_listen,
 	.shutdown	= sock_no_shutdown,
 	.setsockopt	= sock_no_setsockopt,
diff --git a/net/bluetooth/hidp/sock.c b/net/bluetooth/hidp/sock.c
index 008ba439bd62..1eaac01f85de 100644
--- a/net/bluetooth/hidp/sock.c
+++ b/net/bluetooth/hidp/sock.c
@@ -208,7 +208,6 @@ static const struct proto_ops hidp_sock_ops = {
 	.getname	= sock_no_getname,
 	.sendmsg	= sock_no_sendmsg,
 	.recvmsg	= sock_no_recvmsg,
-	.poll		= sock_no_poll,
 	.listen		= sock_no_listen,
 	.shutdown	= sock_no_shutdown,
 	.setsockopt	= sock_no_setsockopt,
diff --git a/net/core/sock.c b/net/core/sock.c
index 835a22f94bc5..b542c6a84165 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2567,12 +2567,6 @@ int sock_no_getname(struct socket *sock, struct sockaddr *saddr,
 }
 EXPORT_SYMBOL(sock_no_getname);
 
-__poll_t sock_no_poll(struct file *file, struct socket *sock, poll_table *pt)
-{
-	return 0;
-}
-EXPORT_SYMBOL(sock_no_poll);
-
 int sock_no_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 {
 	return -EOPNOTSUPP;
-- 
2.17.0

  parent reply	other threads:[~2018-05-23 19:20 UTC|newest]

Thread overview: 72+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-23 19:19 aio poll and a new in-kernel poll API V13 Christoph Hellwig
2018-05-23 19:19 ` [PATCH 01/33] fix io_destroy()/aio_complete() race Christoph Hellwig
2018-05-23 19:19 ` [PATCH 02/33] uapi: turn __poll_t sparse checkin on by default Christoph Hellwig
2018-05-23 19:19 ` [PATCH 03/33] fs: unexport poll_schedule_timeout Christoph Hellwig
2018-05-23 19:19 ` [PATCH 04/33] fs: cleanup do_pollfd Christoph Hellwig
2018-05-23 19:19 ` [PATCH 05/33] fs: update documentation to mention __poll_t and match the code Christoph Hellwig
2018-05-23 19:19 ` [PATCH 06/33] fs: add new vfs_poll and file_can_poll helpers Christoph Hellwig
2018-05-23 19:19 ` [PATCH 07/33] fs: introduce new ->get_poll_head and ->poll_mask methods Christoph Hellwig
2018-05-23 19:19 ` [PATCH 08/33] aio: simplify KIOCB_KEY handling Christoph Hellwig
2018-05-23 19:19 ` [PATCH 09/33] aio: simplify cancellation Christoph Hellwig
2018-05-23 19:19 ` [PATCH 10/33] aio: implement IOCB_CMD_POLL Christoph Hellwig
2018-05-23 19:20 ` [PATCH 11/33] aio: try to complete poll iocbs without context switch Christoph Hellwig
2018-05-23 19:20 ` [PATCH 12/33] net: refactor socket_poll Christoph Hellwig
2018-05-23 19:20 ` [PATCH 13/33] net: add support for ->poll_mask in proto_ops Christoph Hellwig
2018-05-23 19:20 ` Christoph Hellwig [this message]
2018-05-23 19:20 ` [PATCH 15/33] net/tcp: convert to ->poll_mask Christoph Hellwig
2018-05-23 19:20 ` [PATCH 16/33] net/unix: " Christoph Hellwig
2018-05-23 19:20 ` [PATCH 17/33] net: convert datagram_poll users tp ->poll_mask Christoph Hellwig
2018-05-23 19:20 ` [PATCH 18/33] net/dccp: convert to ->poll_mask Christoph Hellwig
2018-05-23 19:20 ` [PATCH 19/33] net/atm: " Christoph Hellwig
2018-05-23 19:20 ` [PATCH 20/33] net/vmw_vsock: " Christoph Hellwig
2018-05-23 19:20 ` [PATCH 21/33] net/tipc: " Christoph Hellwig
2018-05-23 19:20 ` [PATCH 22/33] net/sctp: " Christoph Hellwig
2018-05-23 19:20 ` [PATCH 23/33] net/bluetooth: " Christoph Hellwig
2018-05-23 19:20 ` [PATCH 24/33] net/caif: " Christoph Hellwig
2018-05-23 19:20 ` [PATCH 25/33] net/nfc: " Christoph Hellwig
2018-05-23 19:20 ` [PATCH 26/33] net/phonet: " Christoph Hellwig
2018-05-23 19:20 ` [PATCH 27/33] net/iucv: " Christoph Hellwig
2018-05-23 19:20 ` [PATCH 28/33] net/rxrpc: " Christoph Hellwig
2018-05-23 19:20 ` [PATCH 29/33] crypto: af_alg: " Christoph Hellwig
2018-05-23 19:20 ` [PATCH 30/33] pipe: " Christoph Hellwig
2018-05-23 19:20 ` [PATCH 31/33] eventfd: switch " Christoph Hellwig
2018-05-23 19:20 ` [PATCH 32/33] timerfd: convert " Christoph Hellwig
2018-05-23 19:20 ` [PATCH 33/33] random: " Christoph Hellwig
2018-05-26  0:11 ` aio poll and a new in-kernel poll API V13 Al Viro
2018-05-26  7:09   ` Al Viro
2018-05-26  7:23     ` Christoph Hellwig
2018-05-27 22:27       ` Al Viro
2018-05-27 22:28         ` [PATCH 1/4] aio: all callers of aio_{read,write,fsync,poll} treat 0 and -EIOCBQUEUED the same way Al Viro
2018-05-27 22:28           ` [PATCH 2/4] aio_read_events_ring(): make a bit more readable Al Viro
2018-05-27 22:28           ` [PATCH 3/4] aio: shift copyin of iocb into io_submit_one() Al Viro
2018-05-28  5:16             ` Christoph Hellwig
2018-05-27 22:28           ` [PATCH 4/4] aio: fold do_io_submit() into callers Al Viro
2018-05-27 23:14             ` Al Viro
2018-05-28  5:24               ` Christoph Hellwig
2018-05-28  5:15           ` [PATCH 1/4] aio: all callers of aio_{read,write,fsync,poll} treat 0 and -EIOCBQUEUED the same way Christoph Hellwig
2018-05-28 14:04             ` Al Viro
2018-05-28 17:54               ` Al Viro
2018-05-28 17:57                 ` [PATCH v2 1/6] aio: take list removal to (some) callers of aio_complete() Al Viro
2018-05-28 17:57                   ` [PATCH v2 2/6] aio: all callers of aio_{read,write,fsync,poll} treat 0 and -EIOCBQUEUED the same way Al Viro
2018-05-29  6:08                     ` Christoph Hellwig
2018-05-28 17:57                   ` [PATCH v2 3/6] aio_read_events_ring(): make a bit more readable Al Viro
2018-05-28 17:57                   ` [PATCH v2 4/6] aio: shift copyin of iocb into io_submit_one() Al Viro
2018-05-28 17:57                   ` [PATCH v2 5/6] aio: fold do_io_submit() into callers Al Viro
2018-05-29  6:10                     ` Christoph Hellwig
2018-05-28 17:57                   ` [PATCH v2 6/6] aio: sanitize the limit checking in io_submit(2) Al Viro
2018-05-29  6:10                     ` Christoph Hellwig
2018-05-29  6:08                   ` [PATCH v2 1/6] aio: take list removal to (some) callers of aio_complete() Christoph Hellwig
2018-05-28 22:20                 ` [PATCH 1/4] vmsplice: lift import_iovec() into do_vmsplice() Al Viro
2018-05-28 22:20                   ` [PATCH 2/4] vmsplice(): lift importing iovec into vmsplice(2) and compat counterpart Al Viro
2018-05-28 22:20                   ` [PATCH 3/4] signalfd: lift sigmask copyin and size checks to callers of do_signalfd4() Al Viro
2018-05-28 22:20                   ` [PATCH 4/4] orangefs: simplify compat ioctl handling Al Viro
2018-05-31 11:11                     ` kbuild test robot
2018-05-31 20:54                     ` Mike Marshall
2018-05-31 21:03                       ` Al Viro
2018-06-01 21:13                         ` Mike Marshall
2018-06-06 22:57                   ` [1/4] vmsplice: lift import_iovec() into do_vmsplice() Andrei Vagin
2018-06-07 17:56                     ` Andrei Vagin
2018-06-11 20:14                       ` Cyrill Gorcunov
2018-06-11 20:16                         ` Al Viro
2018-06-11 20:18                           ` Cyrill Gorcunov
2018-06-14 22:22                           ` Andrey Vagin

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=20180523192022.1703-15-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 \
    --subject='Re: [PATCH 14/33] net: remove sock_no_poll' \
    /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

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).