diff --git a/[refs] b/[refs] index a2e7557f3236..0d74fc776777 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 350b1c32ea58d29e25d63fc25e92dd48f9339546 +refs/heads/master: 0cf90ab5b075821940873e73cdbfeb8edc3dabe8 diff --git a/trunk/fs/ceph/msgpool.c b/trunk/fs/ceph/msgpool.c index ad5482c0267b..2f04e0fc4666 100644 --- a/trunk/fs/ceph/msgpool.c +++ b/trunk/fs/ceph/msgpool.c @@ -140,7 +140,7 @@ struct ceph_msg *ceph_msgpool_get(struct ceph_msgpool *pool, int front_len) return msg; } pr_err("msgpool_get %p now %d/%d, %s\n", pool, pool->num, - pool->min, pool->blocking ? "waiting" : "failing"); + pool->min, pool->blocking ? "waiting" : "may fail"); spin_unlock(&pool->lock); if (!pool->blocking) { @@ -151,6 +151,7 @@ struct ceph_msg *ceph_msgpool_get(struct ceph_msgpool *pool, int front_len) if (!IS_ERR(msg)) return msg; + pr_err("msgpool_get %p empty + alloc failed\n", pool); return ERR_PTR(-ENOMEM); }