Merge pull request #11152 from dillaman/wip-17198

librbd: potential deadlock closing image with in-flight readahead Reviewed-by: Mykola Golub <mgolub@mirantis.com>
ceph · Sep 22, 2016 · ff7fda4 · ff7fda4
2 parents 1f09557 + c971d58
commit ff7fda4
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/librbd/image/CloseRequest.cc b/src/librbd/image/CloseRequest.cc
@@ -186,8 +186,9 @@ void CloseRequest<I>::send_flush_readahead() {
   CephContext *cct = m_image_ctx->cct;
   ldout(cct, 10) << this << " " << __func__ << dendl;
 
-  m_image_ctx->readahead.wait_for_pending(create_context_callback<
-    CloseRequest<I>, &CloseRequest<I>::handle_flush_readahead>(this));
+  m_image_ctx->readahead.wait_for_pending(create_async_context_callback(
+    *m_image_ctx, create_context_callback<
+      CloseRequest<I>, &CloseRequest<I>::handle_flush_readahead>(this)));
 }
 
 template <typename I>