summaryrefslogtreecommitdiff
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
parent8c6efb58a5bab880d45b2078cb55ec4320707daf (diff)
ceph: name msgpools; useful error messages
Signed-off-by: Sage Weil <sage@newdream.net>
-rw-r--r--fs/ceph/msgpool.c13
-rw-r--r--fs/ceph/msgpool.h4
-rw-r--r--fs/ceph/osd_client.c6
3 files changed, 16 insertions, 7 deletions
diff --git a/fs/ceph/msgpool.c b/fs/ceph/msgpool.c
index 10d3632cc403..50fe5cc5de76 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 */
diff --git a/fs/ceph/msgpool.h b/fs/ceph/msgpool.h
index 62a61c7fca08..a362605f9368 100644
--- a/fs/ceph/msgpool.h
+++ b/fs/ceph/msgpool.h
@@ -9,12 +9,14 @@
* avoid unexpected OOM conditions.
*/
struct ceph_msgpool {
+ const char *name;
mempool_t *pool;
int front_len; /* preallocated payload size */
};
extern 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);
extern void ceph_msgpool_destroy(struct ceph_msgpool *pool);
extern struct ceph_msg *ceph_msgpool_get(struct ceph_msgpool *,
int front_len);
diff --git a/fs/ceph/osd_client.c b/fs/ceph/osd_client.c
index 97a3a57fe8cd..c0aca732efd3 100644
--- a/fs/ceph/osd_client.c
+++ b/fs/ceph/osd_client.c
@@ -1214,11 +1214,13 @@ int ceph_osdc_init(struct ceph_osd_client *osdc, struct ceph_client *client)
if (!osdc->req_mempool)
goto out;
- err = ceph_msgpool_init(&osdc->msgpool_op, OSD_OP_FRONT_LEN, 10, true);
+ err = ceph_msgpool_init(&osdc->msgpool_op, OSD_OP_FRONT_LEN, 10, true,
+ "osd_op");
if (err < 0)
goto out_mempool;
err = ceph_msgpool_init(&osdc->msgpool_op_reply,
- OSD_OPREPLY_FRONT_LEN, 10, true);
+ OSD_OPREPLY_FRONT_LEN, 10, true,
+ "osd_op_reply");
if (err < 0)
goto out_msgpool;
return 0;