diff options
author | Ilya Dryomov <idryomov@gmail.com> | 2016-02-08 07:39:46 -0500 |
---|---|---|
committer | Ilya Dryomov <idryomov@gmail.com> | 2016-03-25 13:51:41 -0400 |
commit | de2aa102ea464a54dba14b9588e0bc188bd94707 (patch) | |
tree | 63e06ac4f33007b4f2719be957133fc88fa27b89 /net | |
parent | a587d71b0a4b222762e9c3a2352f076532685d9f (diff) |
libceph: rename ceph_osd_req_op::payload_len to indata_len
Follow userspace nomenclature on this - the next commit adds
outdata_len.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/ceph/osd_client.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 3309112e23d0..84075539135b 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c | |||
@@ -498,7 +498,7 @@ void osd_req_op_extent_init(struct ceph_osd_request *osd_req, | |||
498 | if (opcode == CEPH_OSD_OP_WRITE || opcode == CEPH_OSD_OP_WRITEFULL) | 498 | if (opcode == CEPH_OSD_OP_WRITE || opcode == CEPH_OSD_OP_WRITEFULL) |
499 | payload_len += length; | 499 | payload_len += length; |
500 | 500 | ||
501 | op->payload_len = payload_len; | 501 | op->indata_len = payload_len; |
502 | } | 502 | } |
503 | EXPORT_SYMBOL(osd_req_op_extent_init); | 503 | EXPORT_SYMBOL(osd_req_op_extent_init); |
504 | 504 | ||
@@ -517,7 +517,7 @@ void osd_req_op_extent_update(struct ceph_osd_request *osd_req, | |||
517 | BUG_ON(length > previous); | 517 | BUG_ON(length > previous); |
518 | 518 | ||
519 | op->extent.length = length; | 519 | op->extent.length = length; |
520 | op->payload_len -= previous - length; | 520 | op->indata_len -= previous - length; |
521 | } | 521 | } |
522 | EXPORT_SYMBOL(osd_req_op_extent_update); | 522 | EXPORT_SYMBOL(osd_req_op_extent_update); |
523 | 523 | ||
@@ -554,7 +554,7 @@ void osd_req_op_cls_init(struct ceph_osd_request *osd_req, unsigned int which, | |||
554 | 554 | ||
555 | op->cls.argc = 0; /* currently unused */ | 555 | op->cls.argc = 0; /* currently unused */ |
556 | 556 | ||
557 | op->payload_len = payload_len; | 557 | op->indata_len = payload_len; |
558 | } | 558 | } |
559 | EXPORT_SYMBOL(osd_req_op_cls_init); | 559 | EXPORT_SYMBOL(osd_req_op_cls_init); |
560 | 560 | ||
@@ -587,7 +587,7 @@ int osd_req_op_xattr_init(struct ceph_osd_request *osd_req, unsigned int which, | |||
587 | op->xattr.cmp_mode = cmp_mode; | 587 | op->xattr.cmp_mode = cmp_mode; |
588 | 588 | ||
589 | ceph_osd_data_pagelist_init(&op->xattr.osd_data, pagelist); | 589 | ceph_osd_data_pagelist_init(&op->xattr.osd_data, pagelist); |
590 | op->payload_len = payload_len; | 590 | op->indata_len = payload_len; |
591 | return 0; | 591 | return 0; |
592 | } | 592 | } |
593 | EXPORT_SYMBOL(osd_req_op_xattr_init); | 593 | EXPORT_SYMBOL(osd_req_op_xattr_init); |
@@ -707,7 +707,7 @@ static u64 osd_req_encode_op(struct ceph_osd_request *req, | |||
707 | BUG_ON(osd_data->type == CEPH_OSD_DATA_TYPE_NONE); | 707 | BUG_ON(osd_data->type == CEPH_OSD_DATA_TYPE_NONE); |
708 | dst->cls.indata_len = cpu_to_le32(data_length); | 708 | dst->cls.indata_len = cpu_to_le32(data_length); |
709 | ceph_osdc_msg_data_add(req->r_request, osd_data); | 709 | ceph_osdc_msg_data_add(req->r_request, osd_data); |
710 | src->payload_len += data_length; | 710 | src->indata_len += data_length; |
711 | request_data_len += data_length; | 711 | request_data_len += data_length; |
712 | } | 712 | } |
713 | osd_data = &src->cls.response_data; | 713 | osd_data = &src->cls.response_data; |
@@ -750,7 +750,7 @@ static u64 osd_req_encode_op(struct ceph_osd_request *req, | |||
750 | 750 | ||
751 | dst->op = cpu_to_le16(src->op); | 751 | dst->op = cpu_to_le16(src->op); |
752 | dst->flags = cpu_to_le32(src->flags); | 752 | dst->flags = cpu_to_le32(src->flags); |
753 | dst->payload_len = cpu_to_le32(src->payload_len); | 753 | dst->payload_len = cpu_to_le32(src->indata_len); |
754 | 754 | ||
755 | return request_data_len; | 755 | return request_data_len; |
756 | } | 756 | } |