aboutsummaryrefslogtreecommitdiffstats
path: root/net/ceph/osd_client.c
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2012-11-14 10:38:19 -0500
committerAlex Elder <elder@inktank.com>2013-01-17 16:52:04 -0500
commit0120be3c60d46d6d55f4bf7a3d654cc705eb0c54 (patch)
tree5cb52ab14873ee0e33a6a2bc6115373b305114bb /net/ceph/osd_client.c
parent5b9d1b1cd46aa6c8abf891f25c15aee31538da7e (diff)
libceph: pass length to ceph_osdc_build_request()
The len argument to ceph_osdc_build_request() is set up to be passed by address, but that function never updates its value so there's no need to do this. Tighten up the interface by passing the length directly. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'net/ceph/osd_client.c')
-rw-r--r--net/ceph/osd_client.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 37d43d5b828c..e29a3ed92958 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -336,7 +336,7 @@ static void osd_req_encode_op(struct ceph_osd_request *req,
336 * 336 *
337 */ 337 */
338void ceph_osdc_build_request(struct ceph_osd_request *req, 338void ceph_osdc_build_request(struct ceph_osd_request *req,
339 u64 off, u64 *plen, 339 u64 off, u64 len,
340 struct ceph_osd_req_op *src_ops, 340 struct ceph_osd_req_op *src_ops,
341 struct ceph_snap_context *snapc, 341 struct ceph_snap_context *snapc,
342 struct timespec *mtime) 342 struct timespec *mtime)
@@ -390,7 +390,7 @@ void ceph_osdc_build_request(struct ceph_osd_request *req,
390 390
391 if (flags & CEPH_OSD_FLAG_WRITE) { 391 if (flags & CEPH_OSD_FLAG_WRITE) {
392 req->r_request->hdr.data_off = cpu_to_le16(off); 392 req->r_request->hdr.data_off = cpu_to_le16(off);
393 req->r_request->hdr.data_len = cpu_to_le32(*plen + data_len); 393 req->r_request->hdr.data_len = cpu_to_le32(len + data_len);
394 } else if (data_len) { 394 } else if (data_len) {
395 req->r_request->hdr.data_off = 0; 395 req->r_request->hdr.data_off = 0;
396 req->r_request->hdr.data_len = cpu_to_le32(data_len); 396 req->r_request->hdr.data_len = cpu_to_le32(data_len);
@@ -464,7 +464,7 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
464 req->r_num_pages = calc_pages_for(page_align, *plen); 464 req->r_num_pages = calc_pages_for(page_align, *plen);
465 req->r_page_alignment = page_align; 465 req->r_page_alignment = page_align;
466 466
467 ceph_osdc_build_request(req, off, plen, ops, 467 ceph_osdc_build_request(req, off, *plen, ops,
468 snapc, 468 snapc,
469 mtime); 469 mtime);
470 470