commit 4f48280ee1d0654390cd50ad0c41ea93309e7c91
author Sage Weil <sage@newdream.net> Sat Apr 24 09:56:35 2010 -0700
committer Sage Weil <sage@newdream.net> Mon May 17 15:25:24 2010 -0700
tree e0a9b6502ddcf09caa66c99b787685f4846ea7ef
parent 8c6efb58a5bab880d45b2078cb55ec4320707daf

ceph: name msgpools; useful error messages

Signed-off-by: Sage Weil <sage@newdream.net>

fs/ceph/msgpool.c

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 @@
 }
 
 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 @@
 				  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 */