[PATCH 3.11 168/208] macvtap: update file current position
Luis Henriques
luis.henriques at canonical.com
Mon Jan 13 16:00:09 UTC 2014
3.11.10.3 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhi Yong Wu <wuzhy at linux.vnet.ibm.com>
commit e6ebc7f16ca1434a334647aa56399c546be4e64b upstream.
Signed-off-by: Zhi Yong Wu <wuzhy at linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
drivers/net/macvtap.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 70d5800..fa54f0e 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -979,6 +979,8 @@ static ssize_t macvtap_aio_read(struct kiocb *iocb, const struct iovec *iv,
ret = macvtap_do_read(q, iocb, iv, len, file->f_flags & O_NONBLOCK);
ret = min_t(ssize_t, ret, len); /* XXX copied from tun.c. Why? */
+ if (ret > 0)
+ iocb->ki_pos = ret;
out:
return ret;
}
--
1.8.3.2
More information about the kernel-team
mailing list