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>

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 4a876785b68cd5c550dbbb1d2b63071446454081..94f31bde73e8b5da2bd6a0b9acaa2e2b099b4830 100644 (file)
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1854,7 +1854,7 @@ static void rbd_osd_req_callback(struct ceph_osd_request *osd_req,
         * passed to the block layer, which just supports a 32-bit
         * length field.
         */
-       obj_request->xferred = osd_req->r_reply_op_len[0];
+       obj_request->xferred = osd_req->r_ops[0].outdata_len;
        rbd_assert(obj_request->xferred < (u64)UINT_MAX);
 
        opcode = osd_req->r_ops[0].op;

diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index 35c8b006916fb4aea6ba5e43d32414012bf793cb..c6d1d603bacf9b7084f488d0298f17d55903287c 100644 (file)
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -78,6 +78,9 @@ struct ceph_osd_req_op {
        u16 op;           /* CEPH_OSD_OP_* */
        u32 flags;        /* CEPH_OSD_OP_FLAG_* */
        u32 indata_len;   /* request */
+       u32 outdata_len;  /* reply */
+       s32 rval;
+
        union {
                struct ceph_osd_data raw_data_in;
                struct {
@@ -148,8 +151,6 @@ struct ceph_osd_request {
        struct ceph_eversion *r_request_reassert_version;
 
        int               r_result;
-       int               r_reply_op_len[CEPH_OSD_MAX_OP];
-       s32               r_reply_op_result[CEPH_OSD_MAX_OP];
        int               r_got_reply;
        int               r_linger;
 

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 84075539135ba0fc4066a9e1c93e669dffd53d4f..1048edb443431783ae5c5f772887fd55b3432f66 100644 (file)
--- 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)
                int len;
 
                len = le32_to_cpu(op->payload_len);
-               req->r_reply_op_len[i] = len;
+               req->r_ops[i].outdata_len = len;
                dout(" op %d has %d bytes\n", i, len);
                payload_len += len;
                p += sizeof(*op);
@@ -1836,7 +1836,7 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg)
        ceph_decode_need(&p, end, 4 + numops * 4, bad_put);
        retry_attempt = ceph_decode_32(&p);
        for (i = 0; i < numops; i++)
-               req->r_reply_op_result[i] = ceph_decode_32(&p);
+               req->r_ops[i].rval = ceph_decode_32(&p);
 
        if (le16_to_cpu(msg->hdr.version) >= 6) {
                p += 8 + 4; /* skip replay_version */