[PATCH 3.8 142/166] macvtap: update file current position
Kamal Mostafa
kamal at canonical.com
Wed Jan 15 21:52:36 UTC 2014
3.8.13.16 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhi Yong Wu <wuzhy at linux.vnet.ibm.com>
[ Upstream commit e6ebc7f16ca1434a334647aa56399c546be4e64b ]
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: Kamal Mostafa <kamal 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 a4df37f..c8c9bcc 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -911,6 +911,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