aboutsummaryrefslogtreecommitdiff
path: root/net/ceph
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2018-05-17 16:13:07 +0200
committerIlya Dryomov <idryomov@gmail.com>2018-06-04 20:45:58 +0200
commit29e878201ee635940ba018bce51f4ee0f0e47a5b (patch)
treebc501cab9a9a5231d946df3c4c49026d5e26c0e6 /net/ceph
parent4eea0fefd7e60552b36a74f49bd7064d1a5aef2d (diff)
downloadlinux-stericsson-29e878201ee635940ba018bce51f4ee0f0e47a5b.tar.gz
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 <idryomov@gmail.com> Acked-by: Jeff Layton <jlayton@redhat.com> Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Diffstat (limited to 'net/ceph')
-rw-r--r--net/ceph/osd_client.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index be274ab43d01..34b5334548c3 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 {