hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: remove sock_poll_busy_loop 

There is no point in hiding this logic in a helper.  Also remove the
useless events != 0 check and only busy loop once we know we actually
have a poll method.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Christoph Hellwig 2018-07-30 09:42:12 +02:00 committed by David S. Miller
parent d8bbd13bee
commit f641f13b99
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/net/busy_poll.h
View File

@ -121,15 +121,6 @@ static inline void sk_busy_loop(struct sock *sk, int nonblock)
#endif #endif
} }
static inline void sock_poll_busy_loop(struct socket *sock, __poll_t events)
{
if (sk_can_busy_loop(sock->sk) &&
events && (events & POLL_BUSY_LOOP)) {
/* once, only if requested by syscall */
sk_busy_loop(sock->sk, 1);
}
}
/* if this socket can poll_ll, tell the system call */ /* if this socket can poll_ll, tell the system call */
static inline __poll_t sock_poll_busy_flag(struct socket *sock) static inline __poll_t sock_poll_busy_flag(struct socket *sock)
{ {

5
net/socket.c
View File

@ -1132,9 +1132,12 @@ static __poll_t sock_poll(struct file *file, poll_table *wait)
struct socket *sock = file->private_data; struct socket *sock = file->private_data;
__poll_t events = poll_requested_events(wait); __poll_t events = poll_requested_events(wait);
sock_poll_busy_loop(sock, events);
if (!sock->ops->poll) if (!sock->ops->poll)
return 0; return 0;
/* poll once if requested by the syscall */
if (sk_can_busy_loop(sock->sk) && (events & POLL_BUSY_LOOP))
sk_busy_loop(sock->sk, 1);
return sock->ops->poll(file, sock, wait) | sock_poll_busy_flag(sock); return sock->ops->poll(file, sock, wait) | sock_poll_busy_flag(sock);
} }