From: Christoph Hellwig <hch@lst.de>
To: viro@zeniv.linux.org.uk
Cc: Avi Kivity <avi@scylladb.com>,
linux-aio@kvack.org, linux-fsdevel@vger.kernel.org,
netdev@vger.kernel.org, linux-api@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 26/30] crypto: af_alg: convert to ->poll_mask
Date: Wed, 28 Mar 2018 09:29:22 +0200 [thread overview]
Message-ID: <20180328072926.17131-27-hch@lst.de> (raw)
In-Reply-To: <20180328072926.17131-1-hch@lst.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
crypto/af_alg.c | 13 +++----------
crypto/algif_aead.c | 4 ++--
crypto/algif_skcipher.c | 4 ++--
include/crypto/if_alg.h | 3 +--
4 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index 50d75de539f5..330aef1cd08b 100644
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -1060,19 +1060,12 @@ void af_alg_async_cb(struct crypto_async_request *_req, int err)
}
EXPORT_SYMBOL_GPL(af_alg_async_cb);
-/**
- * af_alg_poll - poll system call handler
- */
-__poll_t af_alg_poll(struct file *file, struct socket *sock,
- poll_table *wait)
+__poll_t af_alg_poll_mask(struct socket *sock, __poll_t events)
{
struct sock *sk = sock->sk;
struct alg_sock *ask = alg_sk(sk);
struct af_alg_ctx *ctx = ask->private;
- __poll_t mask;
-
- sock_poll_wait(file, sk_sleep(sk), wait);
- mask = 0;
+ __poll_t mask = 0;
if (!ctx->more || ctx->used)
mask |= EPOLLIN | EPOLLRDNORM;
@@ -1082,7 +1075,7 @@ __poll_t af_alg_poll(struct file *file, struct socket *sock,
return mask;
}
-EXPORT_SYMBOL_GPL(af_alg_poll);
+EXPORT_SYMBOL_GPL(af_alg_poll_mask);
/**
* af_alg_alloc_areq - allocate struct af_alg_async_req
diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c
index 4b07edd5a9ff..330cf9f2b767 100644
--- a/crypto/algif_aead.c
+++ b/crypto/algif_aead.c
@@ -375,7 +375,7 @@ static struct proto_ops algif_aead_ops = {
.sendmsg = aead_sendmsg,
.sendpage = af_alg_sendpage,
.recvmsg = aead_recvmsg,
- .poll = af_alg_poll,
+ .poll_mask = af_alg_poll_mask,
};
static int aead_check_key(struct socket *sock)
@@ -471,7 +471,7 @@ static struct proto_ops algif_aead_ops_nokey = {
.sendmsg = aead_sendmsg_nokey,
.sendpage = aead_sendpage_nokey,
.recvmsg = aead_recvmsg_nokey,
- .poll = af_alg_poll,
+ .poll_mask = af_alg_poll_mask,
};
static void *aead_bind(const char *name, u32 type, u32 mask)
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index c4e885df4564..15cf3c5222e0 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -205,7 +205,7 @@ static struct proto_ops algif_skcipher_ops = {
.sendmsg = skcipher_sendmsg,
.sendpage = af_alg_sendpage,
.recvmsg = skcipher_recvmsg,
- .poll = af_alg_poll,
+ .poll_mask = af_alg_poll_mask,
};
static int skcipher_check_key(struct socket *sock)
@@ -301,7 +301,7 @@ static struct proto_ops algif_skcipher_ops_nokey = {
.sendmsg = skcipher_sendmsg_nokey,
.sendpage = skcipher_sendpage_nokey,
.recvmsg = skcipher_recvmsg_nokey,
- .poll = af_alg_poll,
+ .poll_mask = af_alg_poll_mask,
};
static void *skcipher_bind(const char *name, u32 type, u32 mask)
diff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h
index 482461d8931d..cc414db9da0a 100644
--- a/include/crypto/if_alg.h
+++ b/include/crypto/if_alg.h
@@ -245,8 +245,7 @@ ssize_t af_alg_sendpage(struct socket *sock, struct page *page,
int offset, size_t size, int flags);
void af_alg_free_resources(struct af_alg_async_req *areq);
void af_alg_async_cb(struct crypto_async_request *_req, int err);
-__poll_t af_alg_poll(struct file *file, struct socket *sock,
- poll_table *wait);
+__poll_t af_alg_poll_mask(struct socket *sock, __poll_t events);
struct af_alg_async_req *af_alg_alloc_areq(struct sock *sk,
unsigned int areqlen);
int af_alg_get_rsgl(struct sock *sk, struct msghdr *msg, int flags,
--
2.14.2
next prev parent reply other threads:[~2018-03-28 7:31 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-28 7:28 aio poll and a new in-kernel poll API V7 Christoph Hellwig
2018-03-28 7:28 ` [PATCH 01/30] fs: unexport poll_schedule_timeout Christoph Hellwig
2018-03-28 7:28 ` [PATCH 02/30] fs: cleanup do_pollfd Christoph Hellwig
2018-03-28 7:28 ` [PATCH 03/30] fs: update documentation to mention __poll_t and match the code Christoph Hellwig
2018-03-28 7:29 ` [PATCH 04/30] fs: add new vfs_poll and file_can_poll helpers Christoph Hellwig
2018-03-28 7:29 ` [PATCH 05/30] fs: introduce new ->get_poll_head and ->poll_mask methods Christoph Hellwig
2018-03-28 7:29 ` [PATCH 06/30] aio: simplify cancellation Christoph Hellwig
2018-03-28 7:29 ` [PATCH 07/30] aio: add delayed cancel support Christoph Hellwig
2018-03-28 16:35 ` Al Viro
2018-03-28 21:34 ` Al Viro
2018-03-29 8:53 ` Christoph Hellwig
2018-03-29 14:25 ` Al Viro
2018-03-29 18:08 ` Christoph Hellwig
2018-03-28 7:29 ` [PATCH 08/30] aio: implement IOCB_CMD_POLL Christoph Hellwig
2018-03-28 7:29 ` [PATCH 09/30] net: refactor socket_poll Christoph Hellwig
2018-03-28 7:29 ` [PATCH 10/30] net: add support for ->poll_mask in proto_ops Christoph Hellwig
2018-03-28 7:29 ` [PATCH 11/30] net: remove sock_no_poll Christoph Hellwig
2018-03-28 7:29 ` [PATCH 12/30] net/tcp: convert to ->poll_mask Christoph Hellwig
2018-03-28 7:29 ` [PATCH 13/30] net/unix: " Christoph Hellwig
2018-03-28 7:29 ` [PATCH 14/30] net: convert datagram_poll users tp ->poll_mask Christoph Hellwig
2018-03-28 7:29 ` [PATCH 15/30] net/dccp: convert to ->poll_mask Christoph Hellwig
2018-03-28 7:29 ` [PATCH 16/30] net/atm: " Christoph Hellwig
2018-03-28 7:29 ` [PATCH 17/30] net/vmw_vsock: " Christoph Hellwig
2018-03-28 7:29 ` [PATCH 18/30] net/tipc: " Christoph Hellwig
2018-03-28 7:29 ` [PATCH 19/30] net/sctp: " Christoph Hellwig
2018-03-28 7:29 ` [PATCH 20/30] net/bluetooth: " Christoph Hellwig
2018-03-28 7:29 ` [PATCH 21/30] net/caif: " Christoph Hellwig
2018-03-28 7:29 ` [PATCH 22/30] net/nfc: " Christoph Hellwig
2018-03-28 7:29 ` [PATCH 23/30] net/phonet: " Christoph Hellwig
2018-03-28 7:29 ` [PATCH 24/30] net/iucv: " Christoph Hellwig
2018-03-28 7:29 ` [PATCH 25/30] net/rxrpc: " Christoph Hellwig
2018-03-28 7:29 ` Christoph Hellwig [this message]
2018-03-28 7:29 ` [PATCH 27/30] pipe: " Christoph Hellwig
2018-03-28 7:29 ` [PATCH 28/30] eventfd: switch " Christoph Hellwig
2018-03-28 7:29 ` [PATCH 29/30] timerfd: convert " Christoph Hellwig
2018-03-28 7:29 ` [PATCH 30/30] random: " Christoph Hellwig
2018-03-29 20:32 aio poll and a new in-kernel poll API V8 Christoph Hellwig
2018-03-29 20:33 ` [PATCH 26/30] crypto: af_alg: convert to ->poll_mask Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180328072926.17131-27-hch@lst.de \
--to=hch@lst.de \
--cc=avi@scylladb.com \
--cc=linux-aio@kvack.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).