* [PATCH 1/2] macvtap: update file current position @ 2013-12-04 9:29 Zhi Yong Wu 2013-12-04 9:29 ` [PATCH 2/2] macvtap: remove unused paramter in macvtap_do_read() Zhi Yong Wu 2013-12-06 1:44 ` [PATCH 1/2] macvtap: update file current position David Miller 0 siblings, 2 replies; 4+ messages in thread From: Zhi Yong Wu @ 2013-12-04 9:29 UTC (permalink / raw) To: netdev; +Cc: linux-kernel, Zhi Yong Wu From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> --- drivers/net/macvtap.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 9093004..957cc5c 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -876,6 +876,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.7.6.5 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] macvtap: remove unused paramter in macvtap_do_read() 2013-12-04 9:29 [PATCH 1/2] macvtap: update file current position Zhi Yong Wu @ 2013-12-04 9:29 ` Zhi Yong Wu 2013-12-06 1:44 ` [PATCH 1/2] macvtap: update file current position David Miller 1 sibling, 0 replies; 4+ messages in thread From: Zhi Yong Wu @ 2013-12-04 9:29 UTC (permalink / raw) To: netdev; +Cc: linux-kernel, Zhi Yong Wu From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> --- drivers/net/macvtap.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 957cc5c..c0d412e 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -823,7 +823,7 @@ done: return ret ? ret : copied; } -static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb, +static ssize_t macvtap_do_read(struct macvtap_queue *q, const struct iovec *iv, unsigned long len, int noblock) { @@ -874,7 +874,7 @@ static ssize_t macvtap_aio_read(struct kiocb *iocb, const struct iovec *iv, goto out; } - ret = macvtap_do_read(q, iocb, iv, len, file->f_flags & O_NONBLOCK); + ret = macvtap_do_read(q, 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; @@ -1108,7 +1108,7 @@ static int macvtap_recvmsg(struct kiocb *iocb, struct socket *sock, int ret; if (flags & ~(MSG_DONTWAIT|MSG_TRUNC)) return -EINVAL; - ret = macvtap_do_read(q, iocb, m->msg_iov, total_len, + ret = macvtap_do_read(q, m->msg_iov, total_len, flags & MSG_DONTWAIT); if (ret > total_len) { m->msg_flags |= MSG_TRUNC; -- 1.7.6.5 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] macvtap: update file current position 2013-12-04 9:29 [PATCH 1/2] macvtap: update file current position Zhi Yong Wu 2013-12-04 9:29 ` [PATCH 2/2] macvtap: remove unused paramter in macvtap_do_read() Zhi Yong Wu @ 2013-12-06 1:44 ` David Miller 2013-12-06 1:52 ` Zhi Yong Wu 1 sibling, 1 reply; 4+ messages in thread From: David Miller @ 2013-12-06 1:44 UTC (permalink / raw) To: zwu.kernel; +Cc: netdev, linux-kernel, wuzhy From: Zhi Yong Wu <zwu.kernel@gmail.com> Date: Wed, 4 Dec 2013 17:29:00 +0800 > From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> > > Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> The tun driver seems to have the same exact bug, please if you are going to fix one then fix the other too. Thanks. ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] macvtap: update file current position 2013-12-06 1:44 ` [PATCH 1/2] macvtap: update file current position David Miller @ 2013-12-06 1:52 ` Zhi Yong Wu 0 siblings, 0 replies; 4+ messages in thread From: Zhi Yong Wu @ 2013-12-06 1:52 UTC (permalink / raw) To: David Miller; +Cc: netdev, linux-kernel mlist, Zhi Yong Wu On Fri, Dec 6, 2013 at 9:44 AM, David Miller <davem@davemloft.net> wrote: > From: Zhi Yong Wu <zwu.kernel@gmail.com> > Date: Wed, 4 Dec 2013 17:29:00 +0800 > >> From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> >> >> Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> > > The tun driver seems to have the same exact bug, please if you are going > to fix one then fix the other too. will post v2 with tun bugfix. > > Thanks. -- Regards, Zhi Yong Wu ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-12-06 1:52 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-12-04 9:29 [PATCH 1/2] macvtap: update file current position Zhi Yong Wu 2013-12-04 9:29 ` [PATCH 2/2] macvtap: remove unused paramter in macvtap_do_read() Zhi Yong Wu 2013-12-06 1:44 ` [PATCH 1/2] macvtap: update file current position David Miller 2013-12-06 1:52 ` Zhi Yong Wu
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).