summaryrefslogtreecommitdiffstats
path: root/net/ceph/msgpool.c
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-08-10 00:03:46 +0200
committerSage Weil <sage@newdream.net>2011-10-26 01:10:15 +0200
commitb61c27636fffbaf1980e675282777b9467254a40 (patch)
treebd78cfefda4beb7e3de5fe97dd36fed3dbfa91c1 /net/ceph/msgpool.c
parentlibceph: always preallocate mon connection (diff)
downloadlinux-b61c27636fffbaf1980e675282777b9467254a40.tar.xz
linux-b61c27636fffbaf1980e675282777b9467254a40.zip
libceph: don't complain on msgpool alloc failures
The pool allocation failures are masked by the pool; there is no need to spam the console about them. (That's the whole point of having the pool in the first place.) Mark msg allocations whose failure is safely handled as such. Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'net/ceph/msgpool.c')
-rw-r--r--net/ceph/msgpool.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ceph/msgpool.c b/net/ceph/msgpool.c
index 1f4cb30a42c5..11d5f4196a73 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);
+ msg = ceph_msg_new(0, pool->front_len, gfp_mask, true);
if (!msg) {
dout("msgpool_alloc %s failed\n", pool->name);
} else {
@@ -61,7 +61,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);
+ return ceph_msg_new(0, front_len, GFP_NOFS, false);
}
msg = mempool_alloc(pool->pool, GFP_NOFS);