ceph: update readpages osd request according to size of pages.
Subsystems (2)
PATCH 1/1 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" <[email protected]>
--- fs/ceph/addr.c | 1 + net/ceph/osd_client.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
fs/ceph/addr.c +1 -0
@@ -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;
net/ceph/osd_client.c +2 -1
@@ -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);
Signature · 1 line
2.7.4
Quoted 27 lines · Zheng
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" <[email protected]>--- fs/ceph/addr.c | 1 + net/ceph/osd_client.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)fs/ceph/addr.c +1
-0@@ -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;net/ceph/osd_client.c +0
-0
net/ceph/osd_client.c void osd_req_op_extent_update(struct ceph_osd_request *osd_req, · line 679
Quoted 9 lines
net/ceph/osd_client.c +2
-1@@ -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);
Looks right, but this special casing of the request types at this layer just seems so nasty. I guess it's unavoidable given the way the protocol works, but I can't help feeling like it's a layering violation when I look at it:
Reviewed-by Jeff Layton <[email protected]>