summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-07-09 14:22:34 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-26 11:38:38 -0800
commit9beb73fcb83317786226b4203d7e56c6b0f43adb (patch)
tree625dd1aa57201317108b56b11ae83195655d7939 /include
parentd92d11da1dd8531150823ff429ae29a0cf5e438d (diff)
downloadlinux-3.10-9beb73fcb83317786226b4203d7e56c6b0f43adb.tar.gz
linux-3.10-9beb73fcb83317786226b4203d7e56c6b0f43adb.tar.bz2
linux-3.10-9beb73fcb83317786226b4203d7e56c6b0f43adb.zip
libceph: initialize msgpool message types
(cherry picked from commit d50b409fb8698571d8209e5adfe122e287e31290) 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ceph/msgpool.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/ceph/msgpool.h b/include/linux/ceph/msgpool.h
index a362605f936..09fa96b4343 100644
--- a/include/linux/ceph/msgpool.h
+++ b/include/linux/ceph/msgpool.h
@@ -11,10 +11,11 @@
struct ceph_msgpool {
const char *name;
mempool_t *pool;
+ int type; /* preallocated message type */
int front_len; /* preallocated payload size */
};
-extern int ceph_msgpool_init(struct ceph_msgpool *pool,
+extern int ceph_msgpool_init(struct ceph_msgpool *pool, int type,
int front_len, int size, bool blocking,
const char *name);
extern void ceph_msgpool_destroy(struct ceph_msgpool *pool);