libceph: initialize msgpool message types

Initialize the type field for messages in a msgpool.  The caller was doing
this for osd ops, but not for the reply messages.

Reported-by: Alex Elder <elder@inktank.com>
Signed-off-by: Sage Weil <sage@inktank.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/net/ceph/msgpool.c b/net/ceph/msgpool.c
index 11d5f4196a73..ddec1c10ac80 100644
--- a/net/ceph/msgpool.c
+++ b/net/ceph/msgpool.c
@@ -12,7 +12,7 @@ static void *msgpool_alloc(gfp_t gfp_mask, void *arg)
         struct ceph_msgpool *pool = arg;
         struct ceph_msg *msg;
 
-        msg = ceph_msg_new(0, pool->front_len, gfp_mask, true);
+        msg = ceph_msg_new(pool->type, pool->front_len, gfp_mask, true);
         if (!msg) {
                 dout("msgpool_alloc %s failed\n", pool->name);
         } else {
@@ -32,10 +32,11 @@ static void msgpool_free(void *element, void *arg)
         ceph_msg_put(msg);
 }
 
-int ceph_msgpool_init(struct ceph_msgpool *pool,
+int ceph_msgpool_init(struct ceph_msgpool *pool, int type,
                       int front_len, int size, bool blocking, const char *name)
 {
         dout("msgpool %s init\n", name);
+        pool->type = type;
         pool->front_len = front_len;
         pool->pool = mempool_create(size, msgpool_alloc, msgpool_free, pool);
         if (!pool->pool)
@@ -61,7 +62,7 @@ struct ceph_msg *ceph_msgpool_get(struct ceph_msgpool *pool,
                 WARN_ON(1);
 
                 /* try to alloc a fresh message */
-                return ceph_msg_new(0, front_len, GFP_NOFS, false);
+                return ceph_msg_new(pool->type, front_len, GFP_NOFS, false);
         }
 
         msg = mempool_alloc(pool->pool, GFP_NOFS);