diff options
author | Yan, Zheng <zyan@redhat.com> | 2016-01-07 03:48:57 -0500 |
---|---|---|
committer | Ilya Dryomov <idryomov@gmail.com> | 2016-03-25 13:51:42 -0400 |
commit | 7665d85b7307fa0218881bc2009de067c42dc52e (patch) | |
tree | a516a404d8a70f0730d6973dc9290f250a4adbf5 /net | |
parent | de2aa102ea464a54dba14b9588e0bc188bd94707 (diff) |
libceph: move r_reply_op_{len,result} into struct ceph_osd_req_op
This avoids defining large array of r_reply_op_{len,result} in
in struct ceph_osd_request.
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/ceph/osd_client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 84075539135b..1048edb44343 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c | |||
@@ -1821,7 +1821,7 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg) | |||
1821 | int len; | 1821 | int len; |
1822 | 1822 | ||
1823 | len = le32_to_cpu(op->payload_len); | 1823 | len = le32_to_cpu(op->payload_len); |
1824 | req->r_reply_op_len[i] = len; | 1824 | req->r_ops[i].outdata_len = len; |
1825 | dout(" op %d has %d bytes\n", i, len); | 1825 | dout(" op %d has %d bytes\n", i, len); |
1826 | payload_len += len; | 1826 | payload_len += len; |
1827 | p += sizeof(*op); | 1827 | p += sizeof(*op); |
@@ -1836,7 +1836,7 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg) | |||
1836 | ceph_decode_need(&p, end, 4 + numops * 4, bad_put); | 1836 | ceph_decode_need(&p, end, 4 + numops * 4, bad_put); |
1837 | retry_attempt = ceph_decode_32(&p); | 1837 | retry_attempt = ceph_decode_32(&p); |
1838 | for (i = 0; i < numops; i++) | 1838 | for (i = 0; i < numops; i++) |
1839 | req->r_reply_op_result[i] = ceph_decode_32(&p); | 1839 | req->r_ops[i].rval = ceph_decode_32(&p); |
1840 | 1840 | ||
1841 | if (le16_to_cpu(msg->hdr.version) >= 6) { | 1841 | if (le16_to_cpu(msg->hdr.version) >= 6) { |
1842 | p += 8 + 4; /* skip replay_version */ | 1842 | p += 8 + 4; /* skip replay_version */ |