aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ceph/addr.c
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2013-04-15 15:50:36 -0400
committerSage Weil <sage@inktank.com>2013-05-02 00:18:58 -0400
commit406e2c9f9286fc93ae2191a7abf477dea05aadc9 (patch)
tree121034644585b0171bfd436d77fe988ad1704753 /fs/ceph/addr.c
parentac7f29bf2ee4a526efb68f947475ff77a43028de (diff)
libceph: kill off osd data write_request parameters
In the incremental move toward supporting distinct data items in an osd request some of the functions had "write_request" parameters to indicate, basically, whether the data belonged to in_data or the out_data. Now that we maintain the data fields in the op structure there is no need to indicate the direction, so get rid of the "write_request" parameters. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'fs/ceph/addr.c')
-rw-r--r--fs/ceph/addr.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index 2d6466b5fe82..3e68ac101040 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -245,7 +245,7 @@ static void finish_read(struct ceph_osd_request *req, struct ceph_msg *msg)
245 dout("finish_read %p req %p rc %d bytes %d\n", inode, req, rc, bytes); 245 dout("finish_read %p req %p rc %d bytes %d\n", inode, req, rc, bytes);
246 246
247 /* unlock all pages, zeroing any data we didn't read */ 247 /* unlock all pages, zeroing any data we didn't read */
248 osd_data = osd_req_op_extent_osd_data(req, 0, false); 248 osd_data = osd_req_op_extent_osd_data(req, 0);
249 BUG_ON(osd_data->type != CEPH_OSD_DATA_TYPE_PAGES); 249 BUG_ON(osd_data->type != CEPH_OSD_DATA_TYPE_PAGES);
250 num_pages = calc_pages_for((u64)osd_data->alignment, 250 num_pages = calc_pages_for((u64)osd_data->alignment,
251 (u64)osd_data->length); 251 (u64)osd_data->length);
@@ -343,8 +343,7 @@ static int start_read(struct inode *inode, struct list_head *page_list, int max)
343 } 343 }
344 pages[i] = page; 344 pages[i] = page;
345 } 345 }
346 osd_req_op_extent_osd_data_pages(req, 0, false, pages, len, 0, 346 osd_req_op_extent_osd_data_pages(req, 0, pages, len, 0, false, false);
347 false, false);
348 req->r_callback = finish_read; 347 req->r_callback = finish_read;
349 req->r_inode = inode; 348 req->r_inode = inode;
350 349
@@ -571,7 +570,7 @@ static void writepages_finish(struct ceph_osd_request *req,
571 long writeback_stat; 570 long writeback_stat;
572 unsigned issued = ceph_caps_issued(ci); 571 unsigned issued = ceph_caps_issued(ci);
573 572
574 osd_data = osd_req_op_extent_osd_data(req, 0, true); 573 osd_data = osd_req_op_extent_osd_data(req, 0);
575 BUG_ON(osd_data->type != CEPH_OSD_DATA_TYPE_PAGES); 574 BUG_ON(osd_data->type != CEPH_OSD_DATA_TYPE_PAGES);
576 num_pages = calc_pages_for((u64)osd_data->alignment, 575 num_pages = calc_pages_for((u64)osd_data->alignment,
577 (u64)osd_data->length); 576 (u64)osd_data->length);
@@ -916,7 +915,7 @@ get_more_pages:
916 dout("writepages got %d pages at %llu~%llu\n", 915 dout("writepages got %d pages at %llu~%llu\n",
917 locked_pages, offset, len); 916 locked_pages, offset, len);
918 917
919 osd_req_op_extent_osd_data_pages(req, 0, true, pages, len, 0, 918 osd_req_op_extent_osd_data_pages(req, 0, pages, len, 0,
920 !!pool, false); 919 !!pool, false);
921 920
922 pages = NULL; /* request message now owns the pages array */ 921 pages = NULL; /* request message now owns the pages array */