From: Christoph Hellwig Date: Mon, 30 Jul 2018 07:42:11 +0000 (+0200) Subject: net: don not detour through struct sock to find the poll waitqueue X-Git-Tag: v4.19-rc1~140^2~195^2~2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d8bbd13beeaacd6494954bf5b945b54ccb2af309;p=users%2Fjedix%2Flinux-maple.git net: don not detour through struct sock to find the poll waitqueue For any open socket file descriptor sock->sk->sk_wq->wait will always point to sock->wq->wait. That means we can do the shorter dereference and removal a NULL check and don't have to not worry about any RCU protection. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller --- diff --git a/include/net/sock.h b/include/net/sock.h index 0518f61926ec..2afea5d1bdfe 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -2064,10 +2064,9 @@ static inline bool skwq_has_sleeper(struct socket_wq *wq) static inline void sock_poll_wait(struct file *filp, poll_table *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); + if (!poll_does_not_wait(p)) { + poll_wait(filp, &sock->wq->wait, p); /* We need to be sure we are in sync with the * socket flags modification. *