Linux-Fsdevel Archive on lore.kernel.org
help / color / mirror / Atom feed
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 32/36] crypto: af_alg: convert to ->poll_mask
Date: Wed, 17 Jan 2018 20:27:38 +0100	[thread overview]
Message-ID: <20180117192742.710-33-hch@lst.de> (raw)
In-Reply-To: <20180117192742.710-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 592797ec8075..2639ffda4f4d 100644
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -1058,19 +1058,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 |= POLLIN | POLLRDNORM;
@@ -1080,7 +1073,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 ddcc45f77edd..0f726e55b0b1 100644
--- a/crypto/algif_aead.c
+++ b/crypto/algif_aead.c
@@ -376,7 +376,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)
@@ -472,7 +472,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 494c99cbe48f..e5463cc0821e 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -212,7 +212,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)
@@ -308,7 +308,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 a50bdb9d7cfd..ff575671fb2f 100644
--- a/include/crypto/if_alg.h
+++ b/include/crypto/if_alg.h
@@ -244,8 +244,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

  parent reply	other threads:[~2018-01-17 19:27 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-17 19:27 aio poll, io_pgetevents and a new in-kernel poll API V3 Christoph Hellwig
2018-01-17 19:27 ` [PATCH 01/36] aio: don't print the page size at boot time Christoph Hellwig
2018-01-17 19:27 ` [PATCH 02/36] aio: remove an outdated comment in aio_complete Christoph Hellwig
2018-01-17 19:27 ` [PATCH 03/36] aio: refactor read/write iocb setup Christoph Hellwig
2018-01-17 19:27 ` [PATCH 04/36] aio: sanitize ki_list handling Christoph Hellwig
2018-01-17 19:27 ` [PATCH 05/36] aio: simplify cancellation Christoph Hellwig
2018-01-17 19:27 ` [PATCH 06/36] aio: delete iocbs from the active_reqs list in kiocb_cancel Christoph Hellwig
2018-01-17 19:27 ` [PATCH 07/36] aio: add delayed cancel support Christoph Hellwig
2018-01-17 19:27 ` [PATCH 08/36] aio: implement io_pgetevents Christoph Hellwig
2018-01-17 19:27 ` [PATCH 09/36] fs: unexport poll_schedule_timeout Christoph Hellwig
2018-01-17 19:27 ` [PATCH 10/36] fs: cleanup do_pollfd Christoph Hellwig
2018-01-17 19:27 ` [PATCH 11/36] fs: update documentation for __poll_t Christoph Hellwig
2018-01-17 19:27 ` [PATCH 12/36] fs: add new vfs_poll and file_can_poll helpers Christoph Hellwig
2018-01-17 19:27 ` [PATCH 13/36] fs: introduce new ->get_poll_head and ->poll_mask methods Christoph Hellwig
2018-01-17 19:27 ` [PATCH 14/36] aio: implement IOCB_CMD_POLL Christoph Hellwig
2018-01-17 19:27 ` [PATCH 15/36] net: refactor socket_poll Christoph Hellwig
2018-01-17 19:27 ` [PATCH 16/36] net: add support for ->poll_mask in proto_ops Christoph Hellwig
2018-01-17 19:27 ` [PATCH 17/36] net: remove sock_no_poll Christoph Hellwig
2018-01-17 19:27 ` [PATCH 18/36] net/tcp: convert to ->poll_mask Christoph Hellwig
2018-01-17 19:27 ` [PATCH 19/36] net/unix: " Christoph Hellwig
2018-01-17 19:27 ` [PATCH 20/36] net: convert datagram_poll users tp ->poll_mask Christoph Hellwig
2018-01-17 19:27 ` [PATCH 21/36] net/dccp: convert to ->poll_mask Christoph Hellwig
2018-01-17 19:27 ` [PATCH 22/36] net/atm: " Christoph Hellwig
2018-01-17 19:27 ` [PATCH 23/36] net/vmw_vsock: " Christoph Hellwig
2018-01-17 19:27 ` [PATCH 24/36] net/tipc: " Christoph Hellwig
2018-01-17 19:27 ` [PATCH 25/36] net/sctp: " Christoph Hellwig
2018-01-17 19:27 ` [PATCH 26/36] net/bluetooth: " Christoph Hellwig
2018-01-17 19:27 ` [PATCH 27/36] net/caif: " Christoph Hellwig
2018-01-17 19:27 ` [PATCH 28/36] net/nfc: " Christoph Hellwig
2018-01-17 19:27 ` [PATCH 29/36] net/phonet: " Christoph Hellwig
2018-01-17 19:27 ` [PATCH 30/36] net/iucv: " Christoph Hellwig
2018-01-17 19:27 ` [PATCH 31/36] net/rxrpc: " Christoph Hellwig
2018-01-17 19:27 ` Christoph Hellwig [this message]
2018-01-17 19:27 ` [PATCH 33/36] pipe: " Christoph Hellwig
2018-01-17 19:27 ` [PATCH 34/36] eventfd: switch " Christoph Hellwig
2018-01-17 19:27 ` [PATCH 35/36] timerfd: convert " Christoph Hellwig
2018-01-17 19:27 ` [PATCH 36/36] random: " Christoph Hellwig
2018-01-18 15:46 ` aio poll, io_pgetevents and a new in-kernel poll API V3 Jeff Moyer
2018-01-18 16:44   ` Jeff Moyer
2018-01-18 17:42     ` Christoph Hellwig
2018-01-18 17:59       ` Jeff Moyer
2018-01-18 17:55     ` Colin Walters
2018-01-18 18:53       ` Christoph Hellwig
2018-01-18 17:51   ` Avi Kivity
2018-01-18 17:52     ` Avi Kivity
2018-01-18 17:54     ` Jeff Moyer
2018-01-22 20:12 aio poll, io_pgetevents and a new in-kernel poll API V4 Christoph Hellwig
2018-01-22 20:12 ` [PATCH 32/36] crypto: af_alg: convert to ->poll_mask Christoph Hellwig
2018-03-05 21:27 aio poll, io_pgetevents and a new in-kernel poll API V5 Christoph Hellwig
2018-03-05 21:27 ` [PATCH 32/36] 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=20180117192742.710-33-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 \
    --subject='Re: [PATCH 32/36] crypto: af_alg: convert to ->poll_mask' \
    /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

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).