summaryrefslogtreecommitdiffstats
path: root/net/ceph/msgpool.c
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-07-09 14:22:34 -0700
committerSage Weil <sage@inktank.com>2012-07-30 09:29:50 -0700
commitd50b409fb8698571d8209e5adfe122e287e31290 (patch)
tree1cd91dd0bc9964e115253a0d58bbef6a12f8f015 /net/ceph/msgpool.c
parentfbb85a478f6d4cce6942f1c25c6a68ec5b1e7e7f (diff)
downloadlinux-d50b409fb8698571d8209e5adfe122e287e31290.tar.gz
linux-d50b409fb8698571d8209e5adfe122e287e31290.tar.bz2
linux-d50b409fb8698571d8209e5adfe122e287e31290.zip
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>
Diffstat (limited to 'net/ceph/msgpool.c')
-rw-r--r--net/ceph/msgpool.c7
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);