diff options
author | Alex Elder <elder@inktank.com> | 2013-04-15 15:50:36 -0400 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-05-02 00:18:58 -0400 |
commit | 406e2c9f9286fc93ae2191a7abf477dea05aadc9 (patch) | |
tree | 121034644585b0171bfd436d77fe988ad1704753 /drivers | |
parent | ac7f29bf2ee4a526efb68f947475ff77a43028de (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 'drivers')
-rw-r--r-- | drivers/block/rbd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 13a381b2a779..8e8b876e83c3 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c | |||
@@ -1779,7 +1779,7 @@ static int rbd_img_request_fill_bio(struct rbd_img_request *img_request, | |||
1779 | 1779 | ||
1780 | osd_req_op_extent_init(osd_req, 0, opcode, offset, length, | 1780 | osd_req_op_extent_init(osd_req, 0, opcode, offset, length, |
1781 | 0, 0); | 1781 | 0, 0); |
1782 | osd_req_op_extent_osd_data_bio(osd_req, 0, write_request, | 1782 | osd_req_op_extent_osd_data_bio(osd_req, 0, |
1783 | obj_request->bio_list, obj_request->length); | 1783 | obj_request->bio_list, obj_request->length); |
1784 | rbd_osd_req_format(obj_request, write_request); | 1784 | rbd_osd_req_format(obj_request, write_request); |
1785 | 1785 | ||
@@ -2281,7 +2281,7 @@ static int rbd_obj_read_sync(struct rbd_device *rbd_dev, | |||
2281 | 2281 | ||
2282 | osd_req_op_extent_init(obj_request->osd_req, 0, CEPH_OSD_OP_READ, | 2282 | osd_req_op_extent_init(obj_request->osd_req, 0, CEPH_OSD_OP_READ, |
2283 | offset, length, 0, 0); | 2283 | offset, length, 0, 0); |
2284 | osd_req_op_extent_osd_data_pages(obj_request->osd_req, 0, false, | 2284 | osd_req_op_extent_osd_data_pages(obj_request->osd_req, 0, |
2285 | obj_request->pages, | 2285 | obj_request->pages, |
2286 | obj_request->length, | 2286 | obj_request->length, |
2287 | obj_request->offset & ~PAGE_MASK, | 2287 | obj_request->offset & ~PAGE_MASK, |