UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: remove sock_no_poll 

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>
This commit is contained in:
Christoph Hellwig 2018-04-09 15:26:26 +02:00
parent 1525242310
commit 984652dd8b
10 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crypto/af_alg.c
View File

@ -347,7 +347,6 @@ static const struct proto_ops alg_proto_ops = {
.sendpage = sock_no_sendpage, .sendpage = sock_no_sendpage,
.sendmsg = sock_no_sendmsg, .sendmsg = sock_no_sendmsg,
.recvmsg = sock_no_recvmsg, .recvmsg = sock_no_recvmsg,
.poll = sock_no_poll,
.bind = alg_bind, .bind = alg_bind,
.release = af_alg_release, .release = af_alg_release,

2
crypto/algif_hash.c
View File

@ -288,7 +288,6 @@ static struct proto_ops algif_hash_ops = {
.mmap = sock_no_mmap, .mmap = sock_no_mmap,
.bind = sock_no_bind, .bind = sock_no_bind,
.setsockopt = sock_no_setsockopt, .setsockopt = sock_no_setsockopt,
.poll = sock_no_poll,
.release = af_alg_release, .release = af_alg_release,
.sendmsg = hash_sendmsg, .sendmsg = hash_sendmsg,
@ -396,7 +395,6 @@ static struct proto_ops algif_hash_ops_nokey = {
.mmap = sock_no_mmap, .mmap = sock_no_mmap,
.bind = sock_no_bind, .bind = sock_no_bind,
.setsockopt = sock_no_setsockopt, .setsockopt = sock_no_setsockopt,
.poll = sock_no_poll,
.release = af_alg_release, .release = af_alg_release,
.sendmsg = hash_sendmsg_nokey, .sendmsg = hash_sendmsg_nokey,

1
crypto/algif_rng.c
View File

@ -106,7 +106,6 @@ static struct proto_ops algif_rng_ops = {
.bind = sock_no_bind, .bind = sock_no_bind,
.accept = sock_no_accept, .accept = sock_no_accept,
.setsockopt = sock_no_setsockopt, .setsockopt = sock_no_setsockopt,
.poll = sock_no_poll,
.sendmsg = sock_no_sendmsg, .sendmsg = sock_no_sendmsg,
.sendpage = sock_no_sendpage, .sendpage = sock_no_sendpage,

1
drivers/isdn/mISDN/socket.c
View File

@ -745,7 +745,6 @@ static const struct proto_ops base_sock_ops = {
.getname = sock_no_getname, .getname = sock_no_getname,
.sendmsg = sock_no_sendmsg, .sendmsg = sock_no_sendmsg,
.recvmsg = sock_no_recvmsg, .recvmsg = sock_no_recvmsg,
.poll = sock_no_poll,
.listen = sock_no_listen, .listen = sock_no_listen,
.shutdown = sock_no_shutdown, .shutdown = sock_no_shutdown,
.setsockopt = sock_no_setsockopt, .setsockopt = sock_no_setsockopt,

1
drivers/net/ppp/pptp.c
View File

@ -624,7 +624,6 @@ static const struct proto_ops pptp_ops = {
.socketpair = sock_no_socketpair, .socketpair = sock_no_socketpair,
.accept = sock_no_accept, .accept = sock_no_accept,
.getname = pptp_getname, .getname = pptp_getname,
.poll = sock_no_poll,
.listen = sock_no_listen, .listen = sock_no_listen,
.shutdown = sock_no_shutdown, .shutdown = sock_no_shutdown,
.setsockopt = sock_no_setsockopt, .setsockopt = sock_no_setsockopt,

2
include/net/sock.h
View File

@ -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_socketpair(struct socket *, struct socket *);
int sock_no_accept(struct socket *, struct socket *, int, bool); int sock_no_accept(struct socket *, struct socket *, int, bool);
int sock_no_getname(struct socket *, struct sockaddr *, int); 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_ioctl(struct socket *, unsigned int, unsigned long);
int sock_no_listen(struct socket *, int); int sock_no_listen(struct socket *, int);
int sock_no_shutdown(struct socket *, int); int sock_no_shutdown(struct socket *, int);

1
net/bluetooth/bnep/sock.c
View File

@ -175,7 +175,6 @@ static const struct proto_ops bnep_sock_ops = {
.getname = sock_no_getname, .getname = sock_no_getname,
.sendmsg = sock_no_sendmsg, .sendmsg = sock_no_sendmsg,
.recvmsg = sock_no_recvmsg, .recvmsg = sock_no_recvmsg,
.poll = sock_no_poll,
.listen = sock_no_listen, .listen = sock_no_listen,
.shutdown = sock_no_shutdown, .shutdown = sock_no_shutdown,
.setsockopt = sock_no_setsockopt, .setsockopt = sock_no_setsockopt,

1
net/bluetooth/cmtp/sock.c
View File

@ -178,7 +178,6 @@ static const struct proto_ops cmtp_sock_ops = {
.getname = sock_no_getname, .getname = sock_no_getname,
.sendmsg = sock_no_sendmsg, .sendmsg = sock_no_sendmsg,
.recvmsg = sock_no_recvmsg, .recvmsg = sock_no_recvmsg,
.poll = sock_no_poll,
.listen = sock_no_listen, .listen = sock_no_listen,
.shutdown = sock_no_shutdown, .shutdown = sock_no_shutdown,
.setsockopt = sock_no_setsockopt, .setsockopt = sock_no_setsockopt,

1
net/bluetooth/hidp/sock.c
View File

@ -208,7 +208,6 @@ static const struct proto_ops hidp_sock_ops = {
.getname = sock_no_getname, .getname = sock_no_getname,
.sendmsg = sock_no_sendmsg, .sendmsg = sock_no_sendmsg,
.recvmsg = sock_no_recvmsg, .recvmsg = sock_no_recvmsg,
.poll = sock_no_poll,
.listen = sock_no_listen, .listen = sock_no_listen,
.shutdown = sock_no_shutdown, .shutdown = sock_no_shutdown,
.setsockopt = sock_no_setsockopt, .setsockopt = sock_no_setsockopt,

6
net/core/sock.c
View File

@ -2567,12 +2567,6 @@ int sock_no_getname(struct socket *sock, struct sockaddr *saddr,
} }
EXPORT_SYMBOL(sock_no_getname); 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) int sock_no_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
{ {
return -EOPNOTSUPP; return -EOPNOTSUPP;