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

Commit 2b9a5439 authored by Yan, Zheng's avatar Yan, Zheng Committed by android-build-merger
Browse files

ceph: update readpages osd request according to size of pages 

am: dc8470f3

Change-Id: Ifa9037bd32ce3e4a92bc0cb4219b9235dff3289d
parents 2976604f dc8470f3

fs/ceph/addr.c

+1 −0
Original line number Original line 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;

			nr_pages = i;

			if (nr_pages > 0) {

			if (nr_pages > 0) {

				len = nr_pages << PAGE_SHIFT;

				len = nr_pages << PAGE_SHIFT;

				osd_req_op_extent_update(req, 0, len);

				break;

				break;

			}

			}

			goto out_pages;

			goto out_pages;

net/ceph/osd_client.c

+2 −1
Original line number Original line 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);

	BUG_ON(length > previous);





	op->extent.length = length;

	op->extent.length = length;

	if (op->op == CEPH_OSD_OP_WRITE || op->op == CEPH_OSD_OP_WRITEFULL)

		op->indata_len -= previous - length;

		op->indata_len -= previous - length;

}

}

EXPORT_SYMBOL(osd_req_op_extent_update);

EXPORT_SYMBOL(osd_req_op_extent_update);