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 ...
This commit is contained in:
@@ -1334,7 +1334,7 @@ void raw6_proc_exit(void)
|
||||
}
|
||||
#endif /* CONFIG_PROC_FS */
|
||||
|
||||
/* Same as inet6_dgram_ops, sans udp_poll. */
|
||||
/* Same as inet6_dgram_ops, sans udp_poll_mask. */
|
||||
const struct proto_ops inet6_sockraw_ops = {
|
||||
.family = PF_INET6,
|
||||
.owner = THIS_MODULE,
|
||||
@@ -1344,7 +1344,7 @@ const struct proto_ops inet6_sockraw_ops = {
|
||||
.socketpair = sock_no_socketpair, /* a do nothing */
|
||||
.accept = sock_no_accept, /* a do nothing */
|
||||
.getname = inet6_getname,
|
||||
.poll = datagram_poll, /* ok */
|
||||
.poll_mask = datagram_poll_mask, /* ok */
|
||||
.ioctl = inet6_ioctl, /* must change */
|
||||
.listen = sock_no_listen, /* ok */
|
||||
.shutdown = inet_shutdown, /* ok */
|
||||
|
Reference in New Issue
Block a user