summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-07-30 10:42:13 +0300
committerDavid S. Miller <davem@davemloft.net>2018-07-30 19:10:25 +0300
commita331de3bf0e66ab2437fc8c5b99bd3c0d9da3088 (patch)
tree307bcd2465bd96bc79cecf60abf50630538117a8
parentf641f13b992979b97e595b761a9ba1a64fed7c4e (diff)
downloadlinux-a331de3bf0e66ab2437fc8c5b99bd3c0d9da3088.tar.xz
net: remove sock_poll_busy_flag
Fold it into the only caller to make the code simpler and easier to read. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/busy_poll.h6
-rw-r--r--net/socket.c16
2 files changed, 11 insertions, 11 deletions
diff --git a/include/net/busy_poll.h b/include/net/busy_poll.h
index 85777e68f738..ba61cdd09eaa 100644
--- a/include/net/busy_poll.h
+++ b/include/net/busy_poll.h
@@ -121,12 +121,6 @@ static inline void sk_busy_loop(struct sock *sk, int nonblock)
#endif
}
-/* if this socket can poll_ll, tell the system call */
-static inline __poll_t sock_poll_busy_flag(struct socket *sock)
-{
- return sk_can_busy_loop(sock->sk) ? POLL_BUSY_LOOP : 0;
-}
-
/* used in the NIC receive handler to mark the skb */
static inline void skb_mark_napi_id(struct sk_buff *skb,
struct napi_struct *napi)
diff --git a/net/socket.c b/net/socket.c
index 674434127b3a..5b7df6695f4f 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -1130,15 +1130,21 @@ EXPORT_SYMBOL(sock_create_lite);
static __poll_t sock_poll(struct file *file, poll_table *wait)
{
struct socket *sock = file->private_data;
- __poll_t events = poll_requested_events(wait);
+ __poll_t events = poll_requested_events(wait), flag = 0;
if (!sock->ops->poll)
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);
+ if (sk_can_busy_loop(sock->sk)) {
+ /* poll once if requested by the syscall */
+ if (events & POLL_BUSY_LOOP)
+ sk_busy_loop(sock->sk, 1);
+
+ /* if this socket can poll_ll, tell the system call */
+ flag = POLL_BUSY_LOOP;
+ }
+
+ return sock->ops->poll(file, sock, wait) | flag;
}
static int sock_mmap(struct file *file, struct vm_area_struct *vma)