diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-11-26 06:55:39 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-30 20:47:33 +0100 |
| commit | 1ce0bf50ae2233c7115a18c0c623662d177b434c (patch) | |
| tree | 41860e17fe4b2184055d29e669e503d09796775a /net/atm/common.c | |
| parent | Merge tag 'wireless-drivers-next-for-davem-2015-11-25' of git://git.kernel.or... (diff) | |
| download | linux-1ce0bf50ae2233c7115a18c0c623662d177b434c.tar.xz linux-1ce0bf50ae2233c7115a18c0c623662d177b434c.zip | |
net: Generalise wq_has_sleeper helper
The memory barrier in the helper wq_has_sleeper is needed by just
about every user of waitqueue_active. This patch generalises it
by making it take a wait_queue_head_t directly. The existing
helper is renamed to skwq_has_sleeper.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/atm/common.c')
| -rw-r--r-- | net/atm/common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/atm/common.c b/net/atm/common.c index 49a872db7e42..6dc12305799e 100644 --- a/net/atm/common.c +++ b/net/atm/common.c @@ -96,7 +96,7 @@ static void vcc_def_wakeup(struct sock *sk) rcu_read_lock(); wq = rcu_dereference(sk->sk_wq); - if (wq_has_sleeper(wq)) + if (skwq_has_sleeper(wq)) wake_up(&wq->wait); rcu_read_unlock(); } @@ -117,7 +117,7 @@ static void vcc_write_space(struct sock *sk) if (vcc_writable(sk)) { wq = rcu_dereference(sk->sk_wq); - if (wq_has_sleeper(wq)) + if (skwq_has_sleeper(wq)) wake_up_interruptible(&wq->wait); sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT); |