diff options
author | Greg Kroah-Hartman | 2018-07-16 09:04:54 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2018-07-16 09:04:54 +0200 |
commit | 83cf9cd6d50ed4f7e6ae265e80e38b235c792f5f (patch) | |
tree | 6016c386c321cd6a3e8575e01ed9f10834fc5081 /crypto/af_alg.c | |
parent | parport: ieee1284: mark expected switch fall-throughs (diff) | |
parent | Linux 4.18-rc5 (diff) | |
download | kernel-qcow2-linux-83cf9cd6d50ed4f7e6ae265e80e38b235c792f5f.tar.gz kernel-qcow2-linux-83cf9cd6d50ed4f7e6ae265e80e38b235c792f5f.tar.xz kernel-qcow2-linux-83cf9cd6d50ed4f7e6ae265e80e38b235c792f5f.zip |
Merge 4.18-rc5 into char-misc-next
We want the char-misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'crypto/af_alg.c')
-rw-r--r-- | crypto/af_alg.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c index 49fa8582138b..314c52c967e5 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -1060,12 +1060,19 @@ void af_alg_async_cb(struct crypto_async_request *_req, int err) } EXPORT_SYMBOL_GPL(af_alg_async_cb); -__poll_t af_alg_poll_mask(struct socket *sock, __poll_t events) +/** + * af_alg_poll - poll system call handler + */ +__poll_t af_alg_poll(struct file *file, struct socket *sock, + poll_table *wait) { struct sock *sk = sock->sk; struct alg_sock *ask = alg_sk(sk); struct af_alg_ctx *ctx = ask->private; - __poll_t mask = 0; + __poll_t mask; + + sock_poll_wait(file, sk_sleep(sk), wait); + mask = 0; if (!ctx->more || ctx->used) mask |= EPOLLIN | EPOLLRDNORM; @@ -1075,7 +1082,7 @@ __poll_t af_alg_poll_mask(struct socket *sock, __poll_t events) return mask; } -EXPORT_SYMBOL_GPL(af_alg_poll_mask); +EXPORT_SYMBOL_GPL(af_alg_poll); /** * af_alg_alloc_areq - allocate struct af_alg_async_req |