diff options
Diffstat (limited to 'net/ceph/osd_client.c')
-rw-r--r-- | net/ceph/osd_client.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 2562e4e52245..73227853d845 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c | |||
@@ -550,7 +550,7 @@ void osd_req_op_watch_init(struct ceph_osd_request *osd_req, | |||
550 | } | 550 | } |
551 | EXPORT_SYMBOL(osd_req_op_watch_init); | 551 | EXPORT_SYMBOL(osd_req_op_watch_init); |
552 | 552 | ||
553 | static void ceph_osdc_msg_data_set(struct ceph_msg *msg, | 553 | static void ceph_osdc_msg_data_add(struct ceph_msg *msg, |
554 | struct ceph_osd_data *osd_data) | 554 | struct ceph_osd_data *osd_data) |
555 | { | 555 | { |
556 | u64 length = ceph_osd_data_length(osd_data); | 556 | u64 length = ceph_osd_data_length(osd_data); |
@@ -558,14 +558,14 @@ static void ceph_osdc_msg_data_set(struct ceph_msg *msg, | |||
558 | if (osd_data->type == CEPH_OSD_DATA_TYPE_PAGES) { | 558 | if (osd_data->type == CEPH_OSD_DATA_TYPE_PAGES) { |
559 | BUG_ON(length > (u64) SIZE_MAX); | 559 | BUG_ON(length > (u64) SIZE_MAX); |
560 | if (length) | 560 | if (length) |
561 | ceph_msg_data_set_pages(msg, osd_data->pages, | 561 | ceph_msg_data_add_pages(msg, osd_data->pages, |
562 | length, osd_data->alignment); | 562 | length, osd_data->alignment); |
563 | } else if (osd_data->type == CEPH_OSD_DATA_TYPE_PAGELIST) { | 563 | } else if (osd_data->type == CEPH_OSD_DATA_TYPE_PAGELIST) { |
564 | BUG_ON(!length); | 564 | BUG_ON(!length); |
565 | ceph_msg_data_set_pagelist(msg, osd_data->pagelist); | 565 | ceph_msg_data_add_pagelist(msg, osd_data->pagelist); |
566 | #ifdef CONFIG_BLOCK | 566 | #ifdef CONFIG_BLOCK |
567 | } else if (osd_data->type == CEPH_OSD_DATA_TYPE_BIO) { | 567 | } else if (osd_data->type == CEPH_OSD_DATA_TYPE_BIO) { |
568 | ceph_msg_data_set_bio(msg, osd_data->bio, length); | 568 | ceph_msg_data_add_bio(msg, osd_data->bio, length); |
569 | #endif | 569 | #endif |
570 | } else { | 570 | } else { |
571 | BUG_ON(osd_data->type != CEPH_OSD_DATA_TYPE_NONE); | 571 | BUG_ON(osd_data->type != CEPH_OSD_DATA_TYPE_NONE); |
@@ -600,18 +600,18 @@ static u64 osd_req_encode_op(struct ceph_osd_request *req, | |||
600 | dst->extent.truncate_seq = | 600 | dst->extent.truncate_seq = |
601 | cpu_to_le32(src->extent.truncate_seq); | 601 | cpu_to_le32(src->extent.truncate_seq); |
602 | if (src->op == CEPH_OSD_OP_WRITE) | 602 | if (src->op == CEPH_OSD_OP_WRITE) |
603 | ceph_osdc_msg_data_set(req->r_request, | 603 | ceph_osdc_msg_data_add(req->r_request, |
604 | &src->extent.osd_data); | 604 | &src->extent.osd_data); |
605 | else | 605 | else |
606 | ceph_osdc_msg_data_set(req->r_reply, | 606 | ceph_osdc_msg_data_add(req->r_reply, |
607 | &src->extent.osd_data); | 607 | &src->extent.osd_data); |
608 | break; | 608 | break; |
609 | case CEPH_OSD_OP_CALL: | 609 | case CEPH_OSD_OP_CALL: |
610 | dst->cls.class_len = src->cls.class_len; | 610 | dst->cls.class_len = src->cls.class_len; |
611 | dst->cls.method_len = src->cls.method_len; | 611 | dst->cls.method_len = src->cls.method_len; |
612 | dst->cls.indata_len = cpu_to_le32(src->cls.request_data_len); | 612 | dst->cls.indata_len = cpu_to_le32(src->cls.request_data_len); |
613 | ceph_osdc_msg_data_set(req->r_reply, &src->cls.response_data); | 613 | ceph_osdc_msg_data_add(req->r_reply, &src->cls.response_data); |
614 | ceph_osdc_msg_data_set(req->r_request, &src->cls.request_info); | 614 | ceph_osdc_msg_data_add(req->r_request, &src->cls.request_info); |
615 | BUG_ON(src->cls.request_info.type != | 615 | BUG_ON(src->cls.request_info.type != |
616 | CEPH_OSD_DATA_TYPE_PAGELIST); | 616 | CEPH_OSD_DATA_TYPE_PAGELIST); |
617 | request_data_len = src->cls.request_info.pagelist->length; | 617 | request_data_len = src->cls.request_info.pagelist->length; |