From: Mykola Golub <mgolub@mirantis.com>
Date: Tue, 23 May 2017 10:07:45 +0000 (+0200)
Subject: librbd: potential read IO hang when image is flattened
X-Git-Tag: v12.1.0~57^2~37^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=10d58618e7c632ef01b9537492239e0a042dc17e;p=ceph.git

librbd: potential read IO hang when image is flattened

Fixes: http://tracker.ceph.com/issues/19832
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/librbd/io/ObjectRequest.cc b/src/librbd/io/ObjectRequest.cc
index 1cdb696b7171..2f28f738bd65 100644
--- a/src/librbd/io/ObjectRequest.cc
+++ b/src/librbd/io/ObjectRequest.cc
@@ -217,8 +217,6 @@ bool ObjectReadRequest<I>::should_complete(int r)
         RWLock::RLocker parent_locker(image_ctx->parent_lock);
         if (image_ctx->parent == NULL) {
           ldout(image_ctx->cct, 20) << "parent is gone; do nothing" << dendl;
-          m_state = LIBRBD_AIO_READ_FLAT;
-          finished = false;
           break;
         }