libceph: make r_request msg_size calculation clearer

[cascardo/linux.git] / net / ceph / osd_client.c

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 5bc0537..109d1f8 100644 (file)
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -372,16 +372,6 @@ struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc,
        BUILD_BUG_ON(CEPH_OSD_MAX_OP > U16_MAX);
        BUG_ON(num_ops > CEPH_OSD_MAX_OP);
 
-       msg_size = 4 + 4 + 8 + 8 + 4+8;
-       msg_size += 2 + 4 + 8 + 4 + 4; /* oloc */
-       msg_size += 1 + 8 + 4 + 4;     /* pg_t */
-       msg_size += 4 + CEPH_MAX_OID_NAME_LEN; /* oid */
-       msg_size += 2 + num_ops*sizeof(struct ceph_osd_op);
-       msg_size += 8;  /* snapid */
-       msg_size += 8;  /* snap_seq */
-       msg_size += 8 * (snapc ? snapc->num_snaps : 0);  /* snaps */
-       msg_size += 4;
-
        if (use_mempool) {
                req = mempool_alloc(osdc->req_mempool, gfp_flags);
                memset(req, 0, sizeof(*req));
@@ -420,6 +410,17 @@ struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc,
        }
        req->r_reply = msg;
 
+       msg_size = 4 + 4 + 4; /* client_inc, osdmap_epoch, flags */
+       msg_size += 4 + 4 + 4 + 8; /* mtime, reassert_version */
+       msg_size += 2 + 4 + 8 + 4 + 4; /* oloc */
+       msg_size += 1 + 8 + 4 + 4; /* pgid */
+       msg_size += 4 + CEPH_MAX_OID_NAME_LEN; /* oid */
+       msg_size += 2 + num_ops * sizeof(struct ceph_osd_op);
+       msg_size += 8; /* snapid */
+       msg_size += 8; /* snap_seq */
+       msg_size += 4 + 8 * (snapc ? snapc->num_snaps : 0); /* snaps */
+       msg_size += 4; /* retry_attempt */
+
        /* create request message; allow space for oid */
        if (use_mempool)
                msg = ceph_msgpool_get(&osdc->msgpool_op, 0);
@@ -498,7 +499,7 @@ void osd_req_op_extent_init(struct ceph_osd_request *osd_req,
        if (opcode == CEPH_OSD_OP_WRITE || opcode == CEPH_OSD_OP_WRITEFULL)
                payload_len += length;
 
-       op->payload_len = payload_len;
+       op->indata_len = payload_len;
 }
 EXPORT_SYMBOL(osd_req_op_extent_init);
 
@@ -517,7 +518,7 @@ void osd_req_op_extent_update(struct ceph_osd_request *osd_req,
        BUG_ON(length > previous);
 
        op->extent.length = length;
-       op->payload_len -= previous - length;
+       op->indata_len -= previous - length;
 }
 EXPORT_SYMBOL(osd_req_op_extent_update);
 
@@ -554,7 +555,7 @@ void osd_req_op_cls_init(struct ceph_osd_request *osd_req, unsigned int which,
 
        op->cls.argc = 0;       /* currently unused */
 
-       op->payload_len = payload_len;
+       op->indata_len = payload_len;
 }
 EXPORT_SYMBOL(osd_req_op_cls_init);
 
@@ -587,7 +588,7 @@ int osd_req_op_xattr_init(struct ceph_osd_request *osd_req, unsigned int which,
        op->xattr.cmp_mode = cmp_mode;
 
        ceph_osd_data_pagelist_init(&op->xattr.osd_data, pagelist);
-       op->payload_len = payload_len;
+       op->indata_len = payload_len;
        return 0;
 }
 EXPORT_SYMBOL(osd_req_op_xattr_init);
@@ -707,7 +708,7 @@ static u64 osd_req_encode_op(struct ceph_osd_request *req,
                        BUG_ON(osd_data->type == CEPH_OSD_DATA_TYPE_NONE);
                        dst->cls.indata_len = cpu_to_le32(data_length);
                        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;
                }
                osd_data = &src->cls.response_data;
@@ -750,7 +751,7 @@ static u64 osd_req_encode_op(struct ceph_osd_request *req,
 
        dst->op = cpu_to_le16(src->op);
        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;
 }
@@ -1821,7 +1822,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 +1837,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 */
@@ -2187,7 +2188,8 @@ void ceph_osdc_handle_map(struct ceph_osd_client *osdc, struct ceph_msg *msg)
                goto bad;
 done:
        downgrade_write(&osdc->map_sem);
-       ceph_monc_got_osdmap(&osdc->client->monc, osdc->osdmap->epoch);
+       ceph_monc_got_map(&osdc->client->monc, CEPH_SUB_OSDMAP,
+                         osdc->osdmap->epoch);
 
        /*
         * subscribe to subsequent osdmap updates if full to ensure