From: Ilya Dryomov Date: Thu, 17 May 2018 14:13:07 +0000 (+0200) Subject: libceph: don't warn if req->r_abort_on_full is set X-Git-Tag: v5.15~8597^2~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=29e878201ee635940ba018bce51f4ee0f0e47a5b;p=platform%2Fkernel%2Flinux-starfive.git libceph: don't warn if req->r_abort_on_full is set The "FULL or reached pool quota" warning is there to explain paused requests. No need to emit it if pausing isn't going to occur. Signed-off-by: Ilya Dryomov Acked-by: Jeff Layton Reviewed-by: "Yan, Zheng" --- diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index be274ab..34b5334 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -2239,11 +2239,13 @@ again: (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) || pool_full(osdc, req->r_t.base_oloc.pool))) { dout("req %p full/pool_full\n", req); - pr_warn_ratelimited("FULL or reached pool quota\n"); - req->r_t.paused = true; - maybe_request_map(osdc); - if (req->r_abort_on_full) + if (req->r_abort_on_full) { err = -ENOSPC; + } else { + pr_warn_ratelimited("FULL or reached pool quota\n"); + req->r_t.paused = true; + maybe_request_map(osdc); + } } else if (!osd_homeless(osd)) { need_send = true; } else {