xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: simplify sock_poll_wait

Browse Source 
The wait_address argument is always directly derived from the filp
argument, so remove it.

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:10 +02:00
committed by David S. Miller
parent 3f6bcc5162
commit dd979b4df8
13 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/net/sock.h
View File

@@ -2057,16 +2057,17 @@ static inline bool skwq_has_sleeper(struct socket_wq *wq)
/**
* sock_poll_wait - place memory barrier behind the poll_wait call.
* @filp: file
* @wait_address: socket wait queue
* @p: poll_table
*
* See the comments in the wq_has_sleeper function.
*/
static inline void sock_poll_wait(struct file *filp,
wait_queue_head_t *wait_address, poll_table *p)
static inline void sock_poll_wait(struct file *filp, poll_table *p)
{
if (!poll_does_not_wait(p) && wait_address) {
poll_wait(filp, wait_address, p);
struct socket *sock = filp->private_data;
wait_queue_head_t *wq = sk_sleep(sock->sk);
if (!poll_does_not_wait(p) && wq) {
poll_wait(filp, wq, p);
/* We need to be sure we are in sync with the
* socket flags modification.
*