lkml.org 
[lkml]   [2017]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 151/153] ceph: update readpages osd request according to size of pages
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Yan, Zheng <zyan@redhat.com>

    commit d641df819db8b80198fd85d9de91137e8a823b07 upstream.

    add_to_page_cache_lru() can fails, so the actual pages to read
    can be smaller than the initial size of osd request. We need to
    update osd request size in that case.

    Signed-off-by: Yan, Zheng <zyan@redhat.com>
    Reviewed-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/ceph/addr.c | 1 +
    net/ceph/osd_client.c | 3 ++-
    2 files changed, 3 insertions(+), 1 deletion(-)

    --- a/fs/ceph/addr.c
    +++ b/fs/ceph/addr.c
    @@ -363,6 +363,7 @@ static int start_read(struct inode *inod
    nr_pages = i;
    if (nr_pages > 0) {
    len = nr_pages << PAGE_SHIFT;
    + osd_req_op_extent_update(req, 0, len);
    break;
    }
    goto out_pages;
    --- a/net/ceph/osd_client.c
    +++ b/net/ceph/osd_client.c
    @@ -672,7 +672,8 @@ void osd_req_op_extent_update(struct cep
    BUG_ON(length > previous);

    op->extent.length = length;
    - op->indata_len -= previous - length;
    + if (op->op == CEPH_OSD_OP_WRITE || op->op == CEPH_OSD_OP_WRITEFULL)
    + op->indata_len -= previous - length;
    }
    EXPORT_SYMBOL(osd_req_op_extent_update);


    \
     
     \ /
      Last update: 2017-03-10 15:54    [W:2.147 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site