From b921528d7be285e07eeb1ffdaf8ed8936146d0bc Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Mon, 12 Oct 2020 15:28:52 -0400 Subject: [PATCH] librbd: ignore -ENOENT error when disabling object-map Fixes: https://tracker.ceph.com/issues/47840 Signed-off-by: Jason Dillaman (cherry picked from commit 8e88224d8d1e7602392a81ed4da8139a79600d8f) --- src/librbd/operation/DisableFeaturesRequest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/librbd/operation/DisableFeaturesRequest.cc b/src/librbd/operation/DisableFeaturesRequest.cc index c46d37f05eb7..97c0d2219b64 100644 --- a/src/librbd/operation/DisableFeaturesRequest.cc +++ b/src/librbd/operation/DisableFeaturesRequest.cc @@ -480,7 +480,7 @@ Context *DisableFeaturesRequest::handle_remove_object_map(int *result) { CephContext *cct = image_ctx.cct; ldout(cct, 20) << this << " " << __func__ << ": r=" << *result << dendl; - if (*result < 0) { + if (*result < 0 && *result != -ENOENT) { lderr(cct) << "failed to remove object map: " << cpp_strerror(*result) << dendl; return handle_finish(*result); } -- 2.47.3