Merge branch 'work.aio-1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull aio updates from Al Viro:
 "Majority of AIO stuff this cycle. aio-fsync and aio-poll, mostly.

  The only thing I'm holding back for a day or so is Adam's aio ioprio -
  his last-minute fixup is trivial (missing stub in !CONFIG_BLOCK case),
  but let it sit in -next for decency sake..."

* 'work.aio-1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (46 commits)
  aio: sanitize the limit checking in io_submit(2)
  aio: fold do_io_submit() into callers
  aio: shift copyin of iocb into io_submit_one()
  aio_read_events_ring(): make a bit more readable
  aio: all callers of aio_{read,write,fsync,poll} treat 0 and -EIOCBQUEUED the same way
  aio: take list removal to (some) callers of aio_complete()
  aio: add missing break for the IOCB_CMD_FDSYNC case
  random: convert to ->poll_mask
  timerfd: convert to ->poll_mask
  eventfd: switch to ->poll_mask
  pipe: convert to ->poll_mask
  crypto: af_alg: convert to ->poll_mask
  net/rxrpc: convert to ->poll_mask
  net/iucv: convert to ->poll_mask
  net/phonet: convert to ->poll_mask
  net/nfc: convert to ->poll_mask
  net/caif: convert to ->poll_mask
  net/bluetooth: convert to ->poll_mask
  net/sctp: convert to ->poll_mask
  net/tipc: convert to ->poll_mask
  ...

5 files changed, 7 insertions, 18 deletions

diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index 7846c0c20cfe..89ed613c017e 100644
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -347,7 +347,6 @@ static const struct proto_ops alg_proto_ops = {
         .sendpage       =       sock_no_sendpage,
         .sendmsg        =       sock_no_sendmsg,
         .recvmsg        =       sock_no_recvmsg,
-        .poll           =       sock_no_poll,
 
         .bind           =       alg_bind,
         .release        =       af_alg_release,
@@ -1061,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;
@@ -1083,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_hash.c b/crypto/algif_hash.c
index 6c9b1927a520..bfcf595fd8f9 100644
--- a/crypto/algif_hash.c
+++ b/crypto/algif_hash.c
@@ -288,7 +288,6 @@ static struct proto_ops algif_hash_ops = {
         .mmap           =       sock_no_mmap,
         .bind           =       sock_no_bind,
         .setsockopt     =       sock_no_setsockopt,
-        .poll           =       sock_no_poll,
 
         .release        =       af_alg_release,
         .sendmsg        =       hash_sendmsg,
@@ -396,7 +395,6 @@ static struct proto_ops algif_hash_ops_nokey = {
         .mmap           =       sock_no_mmap,
         .bind           =       sock_no_bind,
         .setsockopt     =       sock_no_setsockopt,
-        .poll           =       sock_no_poll,
 
         .release        =       af_alg_release,
         .sendmsg        =       hash_sendmsg_nokey,
diff --git a/crypto/algif_rng.c b/crypto/algif_rng.c
index 150c2b6480ed..22df3799a17b 100644
--- a/crypto/algif_rng.c
+++ b/crypto/algif_rng.c
@@ -106,7 +106,6 @@ static struct proto_ops algif_rng_ops = {
         .bind           =       sock_no_bind,
         .accept         =       sock_no_accept,
         .setsockopt     =       sock_no_setsockopt,
-        .poll           =       sock_no_poll,
         .sendmsg        =       sock_no_sendmsg,
         .sendpage       =       sock_no_sendpage,
 
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)