From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Jun 2018 20:57:43 +0000 (-0700)
Subject: Merge branch 'work.aio-1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Tag: v4.18-rc1~178
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=408afb8d7847faea115508ba154346e33edfc7d5;p=uclinux-h8%2Flinux.git

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

408afb8d7847faea115508ba154346e33edfc7d5
diff --cc Documentation/filesystems/Locking
index 15853d522941,6d227f9d7bd9..2c391338c675
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@@ -439,8 -439,9 +439,10 @@@ prototypes
  	ssize_t (*read_iter) (struct kiocb *, struct iov_iter *);
  	ssize_t (*write_iter) (struct kiocb *, struct iov_iter *);
  	int (*iterate) (struct file *, struct dir_context *);
 +	int (*iterate_shared) (struct file *, struct dir_context *);
- 	unsigned int (*poll) (struct file *, struct poll_table_struct *);
+ 	__poll_t (*poll) (struct file *, struct poll_table_struct *);
+ 	struct wait_queue_head * (*get_poll_head)(struct file *, __poll_t);
+ 	__poll_t (*poll_mask) (struct file *, __poll_t);
  	long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
  	long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
  	int (*mmap) (struct file *, struct vm_area_struct *);