lkml.org 
[lkml]   [2014]   [Jan]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.5 77/96] macvtap: update file current position
    Date
    3.5.7.29 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>

    commit e6ebc7f16ca1434a334647aa56399c546be4e64b upstream.

    Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Luis Henriques <luis.henriques@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 81fbe78a..b614ab4 100644
    --- a/drivers/net/macvtap.c
    +++ b/drivers/net/macvtap.c
    @@ -906,6 +906,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


    \
     
     \ /
      Last update: 2014-01-13 19:41    [W:3.640 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site