diff options
| author | tadeusz.struk@intel.com <tadeusz.struk@intel.com> | 2015-03-19 12:31:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-23 16:41:36 -0400 |
| commit | 0345f93138b2224e0d7ce91fcffdb3dd23f364d7 (patch) | |
| tree | 7cd37a309382dfc7dd6b028c2b1a88a181692a1c /net/socket.c | |
| parent | 8f2ddaac302a8ca364cb04efb19cd3b5cd058910 (diff) | |
| download | linux-0345f93138b2224e0d7ce91fcffdb3dd23f364d7.tar.bz2 | |
net: socket: add support for async operations
Add support for async operations.
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/socket.c b/net/socket.c index 3e776776f42c..073809f4125f 100644 --- a/net/socket.c +++ b/net/socket.c @@ -798,7 +798,8 @@ static ssize_t sock_read_iter(struct kiocb *iocb, struct iov_iter *to) { struct file *file = iocb->ki_filp; struct socket *sock = file->private_data; - struct msghdr msg = {.msg_iter = *to}; + struct msghdr msg = {.msg_iter = *to, + .msg_iocb = iocb}; ssize_t res; if (file->f_flags & O_NONBLOCK) @@ -819,7 +820,8 @@ static ssize_t sock_write_iter(struct kiocb *iocb, struct iov_iter *from) { struct file *file = iocb->ki_filp; struct socket *sock = file->private_data; - struct msghdr msg = {.msg_iter = *from}; + struct msghdr msg = {.msg_iter = *from, + .msg_iocb = iocb}; ssize_t res; if (iocb->ki_pos != 0) @@ -1894,6 +1896,8 @@ static ssize_t copy_msghdr_from_user(struct msghdr *kmsg, if (nr_segs > UIO_MAXIOV) return -EMSGSIZE; + kmsg->msg_iocb = NULL; + err = rw_copy_check_uvector(save_addr ? READ : WRITE, uiov, nr_segs, UIO_FASTIOV, *iov, iov); |