From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 16 Jul 2019 02:12:08 +0000 (-0400)
Subject: librbd: allow ProgressCtx::update_progress to cancel maintenance ops
X-Git-Tag: v14.2.3~13^2~13
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5dfa2a2e7707797ac88dea9a7beb1289897b73c8;p=ceph.git

librbd: allow ProgressCtx::update_progress to cancel maintenance ops

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 026df758aee8168338c8b44d4551b55000c6ed2e)
---

diff --git a/src/librbd/AsyncObjectThrottle.cc b/src/librbd/AsyncObjectThrottle.cc
index 4a5ae561903ce..b6dbcb261399b 100644
--- a/src/librbd/AsyncObjectThrottle.cc
+++ b/src/librbd/AsyncObjectThrottle.cc
@@ -93,7 +93,10 @@ void AsyncObjectThrottle<T>::start_next_op() {
       done = true;
     }
     if (m_prog_ctx != NULL) {
-      m_prog_ctx->update_progress(ono, m_end_object_no);
+      r = m_prog_ctx->update_progress(ono, m_end_object_no);
+      if (r < 0) {
+        m_ret = r;
+      }
     }
   }
 }