Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc8470f3 authored by Yan, Zheng's avatar Yan, Zheng Committed by Greg Kroah-Hartman
Browse files

ceph: update readpages osd request according to size of pages 



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: default avatarYan, Zheng <zyan@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 27ab5414

fs/ceph/addr.c

+1 −0
Original line number Diff line number Diff line
@@ -363,6 +363,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;

net/ceph/osd_client.c

+2 −1
Original line number Diff line number Diff line
@@ -672,6 +672,7 @@ void osd_req_op_extent_update(struct ceph_osd_request *osd_req, 
	BUG_ON(length > previous);



	op->extent.length = 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);