| Message ID | 1389822580-3426-1-git-send-email-kamal@canonical.com |
|---|---|
| State | New |
| Headers | show |
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 1bff29f..7882545 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1410,6 +1410,8 @@ static ssize_t tun_chr_aio_read(struct kiocb *iocb, const struct iovec *iv, ret = tun_do_read(tun, tfile, iocb, iv, len, file->f_flags & O_NONBLOCK); ret = min_t(ssize_t, ret, len); + if (ret > 0) + iocb->ki_pos = ret; out: tun_put(tun); return ret;
This is a note to let you know that I have just added a patch titled tun: update file current position to the linux-3.8.y-queue branch of the 3.8.y.z extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.8.y-queue This patch is scheduled to be released in version 3.8.13.16. If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.8.y.z tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Kamal ------ From 02224c466b611fc1fc1155290be8aaea3b7a1eff Mon Sep 17 00:00:00 2001 From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> Date: Fri, 6 Dec 2013 14:16:51 +0800 Subject: tun: update file current position [ Upstream commit d0b7da8afa079ffe018ab3e92879b7138977fc8f ] Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Kamal Mostafa <kamal@canonical.com> --- drivers/net/tun.c | 2 ++ 1 file changed, 2 insertions(+) -- 1.8.3.2