From: Dongsheng Yang <dongsheng.yang@easystack.cn>
Date: Fri, 23 Dec 2016 02:00:41 +0000 (-0500)
Subject: librbd: don't remove an image w/ incompatible features
X-Git-Tag: v11.2.1~196^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F13247%2Fhead;p=ceph.git

librbd: don't remove an image w/ incompatible features

Fixes: http://tracker.ceph.com/issues/18315
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
(cherry picked from commit f76127b5e617923d14adb62bfb836a635c14f209)
---

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index 8512e6f4999c..749a66b04080 100644
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -1583,6 +1583,9 @@ int mirror_image_disable_internal(ImageCtx *ictx, bool force,
     if (r < 0) {
       ldout(cct, 2) << "error opening image: " << cpp_strerror(-r) << dendl;
       delete ictx;
+      if (r != -ENOENT) {
+	return r;
+      }
     } else {
       string header_oid = ictx->header_oid;
       old_format = ictx->old_format;