Merge branch 'work.aio-1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Jun 2018 20:57:43 +0000 (13:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Jun 2018 20:57:43 +0000 (13:57 -0700)
commit408afb8d7847faea115508ba154346e33edfc7d5
tree9b558f8477d7400ad5e8849c2624471915654ade
parentb058efc1acfd99027b4c70458e72c3d20a1a5bbc
parent1da92779e2e8f309d5aecbbed346e7f812b174e8
Merge branch 'work.aio-1' of git://git./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
  ...
32 files changed:
Documentation/filesystems/Locking
drivers/net/ppp/pppoe.c
drivers/vhost/vhost.c
include/linux/fs.h
include/net/sctp/sctp.h
include/net/tcp.h
include/net/udp.h
net/9p/trans_fd.c
net/ax25/af_ax25.c
net/bluetooth/af_bluetooth.c
net/can/bcm.c
net/core/sock.c
net/dccp/proto.c
net/decnet/af_decnet.c
net/ipv4/tcp.c
net/ipv4/udp.c
net/ipv6/raw.c
net/kcm/kcmsock.c
net/key/af_key.c
net/l2tp/l2tp_ppp.c
net/llc/af_llc.c
net/netlink/af_netlink.c
net/netrom/af_netrom.c
net/packet/af_packet.c
net/phonet/socket.c
net/rose/af_rose.c
net/rxrpc/af_rxrpc.c
net/sctp/ipv6.c
net/sctp/protocol.c
net/sctp/socket.c
net/tipc/socket.c
net/unix/af_unix.c