Removing unnecessary messages saves code and text. Site specific OOM messages are duplications of a generic MM out of memory message and aren't really useful, so just delete them. Signed-off-by: Joe Perches <joe@xxxxxxxxxxx> --- net/ceph/messenger.c | 5 +---- net/ceph/msgpool.c | 6 +----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index c340e2e..2cd6683 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -2331,11 +2331,8 @@ struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags) } else { m->front.iov_base = kmalloc(front_len, flags); } - if (m->front.iov_base == NULL) { - pr_err("msg_new can't allocate %d bytes\n", - front_len); + if (m->front.iov_base == NULL) goto out2; - } } else { m->front.iov_base = NULL; } diff --git a/net/ceph/msgpool.c b/net/ceph/msgpool.c index d5f2d97..4ac37d4 100644 --- a/net/ceph/msgpool.c +++ b/net/ceph/msgpool.c @@ -10,12 +10,8 @@ static void *alloc_fn(gfp_t gfp_mask, void *arg) { struct ceph_msgpool *pool = arg; - void *p; - p = ceph_msg_new(0, pool->front_len, gfp_mask); - if (!p) - pr_err("msgpool %s alloc failed\n", pool->name); - return p; + return ceph_msg_new(0, pool->front_len, gfp_mask); } static void free_fn(void *element, void *arg) -- 1.7.6.405.gc1be0 -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html