Commit de2aa102 authored by Ilya Dryomov's avatar Ilya Dryomov

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: default avatarIlya Dryomov <idryomov@gmail.com>
parent a587d71b
...@@ -77,7 +77,7 @@ struct ceph_osd_data { ...@@ -77,7 +77,7 @@ struct ceph_osd_data {
struct ceph_osd_req_op { struct ceph_osd_req_op {
u16 op; /* CEPH_OSD_OP_* */ u16 op; /* CEPH_OSD_OP_* */
u32 flags; /* CEPH_OSD_OP_FLAG_* */ u32 flags; /* CEPH_OSD_OP_FLAG_* */
u32 payload_len; u32 indata_len; /* request */
union { union {
struct ceph_osd_data raw_data_in; struct ceph_osd_data raw_data_in;
struct { struct {
......
...@@ -498,7 +498,7 @@ void osd_req_op_extent_init(struct ceph_osd_request *osd_req, ...@@ -498,7 +498,7 @@ void osd_req_op_extent_init(struct ceph_osd_request *osd_req,
if (opcode == CEPH_OSD_OP_WRITE || opcode == CEPH_OSD_OP_WRITEFULL) if (opcode == CEPH_OSD_OP_WRITE || opcode == CEPH_OSD_OP_WRITEFULL)
payload_len += length; payload_len += length;
op->payload_len = payload_len; op->indata_len = payload_len;
} }
EXPORT_SYMBOL(osd_req_op_extent_init); EXPORT_SYMBOL(osd_req_op_extent_init);
...@@ -517,7 +517,7 @@ void osd_req_op_extent_update(struct ceph_osd_request *osd_req, ...@@ -517,7 +517,7 @@ void osd_req_op_extent_update(struct ceph_osd_request *osd_req,
BUG_ON(length > previous); BUG_ON(length > previous);
op->extent.length = length; op->extent.length = length;
op->payload_len -= previous - length; op->indata_len -= previous - length;
} }
EXPORT_SYMBOL(osd_req_op_extent_update); EXPORT_SYMBOL(osd_req_op_extent_update);
...@@ -554,7 +554,7 @@ void osd_req_op_cls_init(struct ceph_osd_request *osd_req, unsigned int which, ...@@ -554,7 +554,7 @@ void osd_req_op_cls_init(struct ceph_osd_request *osd_req, unsigned int which,
op->cls.argc = 0; /* currently unused */ op->cls.argc = 0; /* currently unused */
op->payload_len = payload_len; op->indata_len = payload_len;
} }
EXPORT_SYMBOL(osd_req_op_cls_init); EXPORT_SYMBOL(osd_req_op_cls_init);
...@@ -587,7 +587,7 @@ int osd_req_op_xattr_init(struct ceph_osd_request *osd_req, unsigned int which, ...@@ -587,7 +587,7 @@ int osd_req_op_xattr_init(struct ceph_osd_request *osd_req, unsigned int which,
op->xattr.cmp_mode = cmp_mode; op->xattr.cmp_mode = cmp_mode;
ceph_osd_data_pagelist_init(&op->xattr.osd_data, pagelist); ceph_osd_data_pagelist_init(&op->xattr.osd_data, pagelist);
op->payload_len = payload_len; op->indata_len = payload_len;
return 0; return 0;
} }
EXPORT_SYMBOL(osd_req_op_xattr_init); EXPORT_SYMBOL(osd_req_op_xattr_init);
...@@ -707,7 +707,7 @@ static u64 osd_req_encode_op(struct ceph_osd_request *req, ...@@ -707,7 +707,7 @@ static u64 osd_req_encode_op(struct ceph_osd_request *req,
BUG_ON(osd_data->type == CEPH_OSD_DATA_TYPE_NONE); BUG_ON(osd_data->type == CEPH_OSD_DATA_TYPE_NONE);
dst->cls.indata_len = cpu_to_le32(data_length); dst->cls.indata_len = cpu_to_le32(data_length);
ceph_osdc_msg_data_add(req->r_request, osd_data); ceph_osdc_msg_data_add(req->r_request, osd_data);
src->payload_len += data_length; src->indata_len += data_length;
request_data_len += data_length; request_data_len += data_length;
} }
osd_data = &src->cls.response_data; osd_data = &src->cls.response_data;
...@@ -750,7 +750,7 @@ static u64 osd_req_encode_op(struct ceph_osd_request *req, ...@@ -750,7 +750,7 @@ static u64 osd_req_encode_op(struct ceph_osd_request *req,
dst->op = cpu_to_le16(src->op); dst->op = cpu_to_le16(src->op);
dst->flags = cpu_to_le32(src->flags); dst->flags = cpu_to_le32(src->flags);
dst->payload_len = cpu_to_le32(src->payload_len); dst->payload_len = cpu_to_le32(src->indata_len);
return request_data_len; return request_data_len;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment