ceph: keep reserved replies on the request structure

[net-next-2.6.git] / fs / ceph / osd_client.h

diff --git a/fs/ceph/osd_client.h b/fs/ceph/osd_client.h
index 4162c6810a8f7c8debb5f6f26ed9a7d31675a7cb..8d533d9406ffca2eae77e5fbec592f6913e74dec 100644 (file)
--- a/fs/ceph/osd_client.h
+++ b/fs/ceph/osd_client.h
@@ -44,7 +44,7 @@ struct ceph_osd_request {
        struct ceph_osd *r_osd;
        struct ceph_pg   r_pgid;
 
-       struct ceph_connection *r_con_filling_pages;
+       struct ceph_connection *r_con_filling_msg;
 
        struct ceph_msg  *r_request, *r_reply;
        int               r_result;
@@ -75,6 +75,9 @@ struct ceph_osd_request {
        struct page     **r_pages;            /* pages for data payload */
        int               r_pages_from_pool;
        int               r_own_pages;        /* if true, i own page list */
+
+       struct ceph_msg   *replies[2];
+       int               cur_reply;
 };
 
 struct ceph_osd_client {
@@ -98,8 +101,7 @@ struct ceph_osd_client {
 
        mempool_t              *req_mempool;
 
-       struct ceph_msgpool   msgpool_op;
-       struct ceph_msgpool   msgpool_op_reply;
+       struct ceph_msgpool     msgpool_op;
 };
 
 extern int ceph_osdc_init(struct ceph_osd_client *osdc,