diff options
Diffstat (limited to 'fs/ceph/addr.c')
-rw-r--r-- | fs/ceph/addr.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 5d8ce79385ed..cf9032abc8f5 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c | |||
@@ -342,10 +342,8 @@ static int start_read(struct inode *inode, struct list_head *page_list, int max) | |||
342 | } | 342 | } |
343 | pages[i] = page; | 343 | pages[i] = page; |
344 | } | 344 | } |
345 | req->r_data_in.type = CEPH_OSD_DATA_TYPE_PAGES; | 345 | ceph_osd_data_pages_init(&req->r_data_in, pages, len, 0, |
346 | req->r_data_in.pages = pages; | 346 | false, false); |
347 | req->r_data_in.length = len; | ||
348 | req->r_data_in.alignment = 0; | ||
349 | req->r_callback = finish_read; | 347 | req->r_callback = finish_read; |
350 | req->r_inode = inode; | 348 | req->r_inode = inode; |
351 | 349 | ||
@@ -917,11 +915,8 @@ get_more_pages: | |||
917 | dout("writepages got %d pages at %llu~%llu\n", | 915 | dout("writepages got %d pages at %llu~%llu\n", |
918 | locked_pages, offset, len); | 916 | locked_pages, offset, len); |
919 | 917 | ||
920 | req->r_data_out.type = CEPH_OSD_DATA_TYPE_PAGES; | 918 | ceph_osd_data_pages_init(&req->r_data_out, pages, len, 0, |
921 | req->r_data_out.pages = pages; | 919 | !!pool, false); |
922 | req->r_data_out.length = len; | ||
923 | req->r_data_out.alignment = 0; | ||
924 | req->r_data_out.pages_from_pool = !!pool; | ||
925 | 920 | ||
926 | pages = NULL; /* request message now owns the pages array */ | 921 | pages = NULL; /* request message now owns the pages array */ |
927 | pool = NULL; | 922 | pool = NULL; |