Merge pull request #12638 from yangdongsheng/rbd_remove_incompatible

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

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2017-01-06 17:56:53 -05:00 committed by GitHub
commit 21a8c69313

View File

@ -1502,6 +1502,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;