From: Yan, Zheng Date: Thu, 19 Jan 2017 03:21:29 +0000 (+0800) Subject: ceph: update readpages osd request according to size of pages X-Git-Tag: v4.11-rc1~47^2~39 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d641df819db8b80198fd85d9de91137e8a823b07;p=thirdparty%2Fkernel%2Flinux.git ceph: update readpages osd request according to size of pages 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 Reviewed-by: Jeff Layton --- diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 39852567d66e8..4547bbf80e4f4 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -391,6 +391,7 @@ static int start_read(struct inode *inode, struct list_head *page_list, int max) nr_pages = i; if (nr_pages > 0) { len = nr_pages << PAGE_SHIFT; + osd_req_op_extent_update(req, 0, len); break; } goto out_pages; diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 842f049abb86d..3a2417bb6ff06 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -672,7 +672,8 @@ void osd_req_op_extent_update(struct ceph_osd_request *osd_req, 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);