From 85bda6e263400118830aa40a889bdb695d321b58 Mon Sep 17 00:00:00 2001
From: Dongsheng Yang <dongsheng.yang@easystack.cn>
Date: Thu, 22 Dec 2016 21:00:41 -0500
Subject: [PATCH] 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)
---
 src/librbd/internal.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index 8512e6f4999..749a66b0408 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;
-- 
2.47.3