diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-11-26 00:55:39 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-11-30 14:47:33 -0500 |
commit | 1ce0bf50ae2233c7115a18c0c623662d177b434c (patch) | |
tree | 41860e17fe4b2184055d29e669e503d09796775a /crypto/algif_skcipher.c | |
parent | c52fd05a2ff2ad20e2a7056baf314c7d1d624ba9 (diff) |
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 'crypto/algif_skcipher.c')
-rw-r--r-- | crypto/algif_skcipher.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index af31a0ee4057..0e6702e41472 100644 --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c | |||
@@ -238,7 +238,7 @@ static void skcipher_wmem_wakeup(struct sock *sk) | |||
238 | 238 | ||
239 | rcu_read_lock(); | 239 | rcu_read_lock(); |
240 | wq = rcu_dereference(sk->sk_wq); | 240 | wq = rcu_dereference(sk->sk_wq); |
241 | if (wq_has_sleeper(wq)) | 241 | if (skwq_has_sleeper(wq)) |
242 | wake_up_interruptible_sync_poll(&wq->wait, POLLIN | | 242 | wake_up_interruptible_sync_poll(&wq->wait, POLLIN | |
243 | POLLRDNORM | | 243 | POLLRDNORM | |
244 | POLLRDBAND); | 244 | POLLRDBAND); |
@@ -288,7 +288,7 @@ static void skcipher_data_wakeup(struct sock *sk) | |||
288 | 288 | ||
289 | rcu_read_lock(); | 289 | rcu_read_lock(); |
290 | wq = rcu_dereference(sk->sk_wq); | 290 | wq = rcu_dereference(sk->sk_wq); |
291 | if (wq_has_sleeper(wq)) | 291 | if (skwq_has_sleeper(wq)) |
292 | wake_up_interruptible_sync_poll(&wq->wait, POLLOUT | | 292 | wake_up_interruptible_sync_poll(&wq->wait, POLLOUT | |
293 | POLLRDNORM | | 293 | POLLRDNORM | |
294 | POLLRDBAND); | 294 | POLLRDBAND); |