diff options
Diffstat (limited to 'net/ceph/osd_client.c')
| -rw-r--r-- | net/ceph/osd_client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index d23a9f81f3d7..fa9530dd876e 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c | |||
| @@ -2315,7 +2315,7 @@ again: | |||
| 2315 | (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) || | 2315 | (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) || |
| 2316 | pool_full(osdc, req->r_t.base_oloc.pool))) { | 2316 | pool_full(osdc, req->r_t.base_oloc.pool))) { |
| 2317 | dout("req %p full/pool_full\n", req); | 2317 | dout("req %p full/pool_full\n", req); |
| 2318 | if (osdc->abort_on_full) { | 2318 | if (ceph_test_opt(osdc->client, ABORT_ON_FULL)) { |
| 2319 | err = -ENOSPC; | 2319 | err = -ENOSPC; |
| 2320 | } else { | 2320 | } else { |
| 2321 | pr_warn_ratelimited("FULL or reached pool quota\n"); | 2321 | pr_warn_ratelimited("FULL or reached pool quota\n"); |
| @@ -2545,7 +2545,7 @@ static void ceph_osdc_abort_on_full(struct ceph_osd_client *osdc) | |||
| 2545 | { | 2545 | { |
| 2546 | bool victims = false; | 2546 | bool victims = false; |
| 2547 | 2547 | ||
| 2548 | if (osdc->abort_on_full && | 2548 | if (ceph_test_opt(osdc->client, ABORT_ON_FULL) && |
| 2549 | (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) || have_pool_full(osdc))) | 2549 | (ceph_osdmap_flag(osdc, CEPH_OSDMAP_FULL) || have_pool_full(osdc))) |
| 2550 | for_each_request(osdc, abort_on_full_fn, &victims); | 2550 | for_each_request(osdc, abort_on_full_fn, &victims); |
| 2551 | } | 2551 | } |
