]> bbs.cooldavid.org Git - net-next-2.6.git/blobdiff - fs/ceph/osd_client.c
ceph: simplify ceph_msg_new
[net-next-2.6.git] / fs / ceph / osd_client.c
index a51d0df2af303041c1d797a141407d070d14877a..a44b3b6374ee8d5cf077bf9a2ae63144afc871c9 100644 (file)
@@ -164,7 +164,7 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
                msg = ceph_msgpool_get(&osdc->msgpool_op_reply, 0);
        else
                msg = ceph_msg_new(CEPH_MSG_OSD_OPREPLY,
-                                  OSD_OPREPLY_FRONT_LEN, 0, 0, NULL);
+                                  OSD_OPREPLY_FRONT_LEN);
        if (!msg) {
                ceph_osdc_put_request(req);
                return NULL;
@@ -178,7 +178,7 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
        if (use_mempool)
                msg = ceph_msgpool_get(&osdc->msgpool_op, 0);
        else
-               msg = ceph_msg_new(CEPH_MSG_OSD_OP, msg_size, 0, 0, NULL);
+               msg = ceph_msg_new(CEPH_MSG_OSD_OP, msg_size);
        if (!msg) {
                ceph_osdc_put_request(req);
                return NULL;
@@ -1392,7 +1392,7 @@ static struct ceph_msg *get_reply(struct ceph_connection *con,
        if (front > req->r_reply->front.iov_len) {
                pr_warning("get_reply front %d > preallocated %d\n",
                           front, (int)req->r_reply->front.iov_len);
-               m = ceph_msg_new(CEPH_MSG_OSD_OPREPLY, front, 0, 0, NULL);
+               m = ceph_msg_new(CEPH_MSG_OSD_OPREPLY, front);
                if (!m)
                        goto out;
                ceph_msg_put(req->r_reply);
@@ -1435,7 +1435,7 @@ static struct ceph_msg *alloc_msg(struct ceph_connection *con,
 
        switch (type) {
        case CEPH_MSG_OSD_MAP:
-               return ceph_msg_new(type, front, 0, 0, NULL);
+               return ceph_msg_new(type, front);
        case CEPH_MSG_OSD_OPREPLY:
                return get_reply(con, hdr, skip);
        default: