aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ceph/msgpool.c
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2010-04-24 09:56:35 -0700
committerSage Weil <sage@newdream.net>2010-05-17 15:25:24 -0700
commit4f48280ee1d0654390cd50ad0c41ea93309e7c91 (patch)
treee0a9b6502ddcf09caa66c99b787685f4846ea7ef /fs/ceph/msgpool.c
parent8c6efb58a5bab880d45b2078cb55ec4320707daf (diff)
downloadkernel_samsung_smdk4412-4f48280ee1d0654390cd50ad0c41ea93309e7c91.zip
kernel_samsung_smdk4412-4f48280ee1d0654390cd50ad0c41ea93309e7c91.tar.gz
kernel_samsung_smdk4412-4f48280ee1d0654390cd50ad0c41ea93309e7c91.tar.bz2
ceph: name msgpools; useful error messages
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/msgpool.c')
-rw-r--r--fs/ceph/msgpool.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/fs/ceph/msgpool.c b/fs/ceph/msgpool.c
index 10d3632..50fe5cc 100644
--- a/fs/ceph/msgpool.c
+++ b/fs/ceph/msgpool.c
@@ -10,8 +10,12 @@
static void *alloc_fn(gfp_t gfp_mask, void *arg)
{
struct ceph_msgpool *pool = arg;
+ void *p;
- return ceph_msg_new(0, pool->front_len);
+ p = ceph_msg_new(0, pool->front_len);
+ if (!p)
+ pr_err("msgpool %s alloc failed\n", pool->name);
+ return p;
}
static void free_fn(void *element, void *arg)
@@ -20,12 +24,13 @@ static void free_fn(void *element, void *arg)
}
int ceph_msgpool_init(struct ceph_msgpool *pool,
- int front_len, int size, bool blocking)
+ int front_len, int size, bool blocking, const char *name)
{
pool->front_len = front_len;
pool->pool = mempool_create(size, alloc_fn, free_fn, pool);
if (!pool->pool)
return -ENOMEM;
+ pool->name = name;
return 0;
}
@@ -38,8 +43,8 @@ struct ceph_msg *ceph_msgpool_get(struct ceph_msgpool *pool,
int front_len)
{
if (front_len > pool->front_len) {
- pr_err("msgpool_get pool %p need front %d, pool size is %d\n",
- pool, front_len, pool->front_len);
+ pr_err("msgpool_get pool %s need front %d, pool size is %d\n",
+ pool->name, front_len, pool->front_len);
WARN_ON(1);
/* try to alloc a fresh message */