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 4a5ae561903ceb8398732d0fdf6dcefa4a05b873..b6dbcb261399bb4df84684c5123caa2d63eb1399 100644 (file)
--- 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;
+      }
     }
   }
 }