From: Josh Durgin <jdurgin@redhat.com>
Date: Thu, 26 Feb 2015 02:52:19 +0000 (-0800)
Subject: Merge pull request #3796 from ceph/wip-librbd-async-operations
X-Git-Tag: v0.93~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=32fd35508633d82c307cbc0f0da96467243fa6a7;p=ceph.git

Merge pull request #3796 from ceph/wip-librbd-async-operations

librbd: better handling for async maintenance requests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

32fd35508633d82c307cbc0f0da96467243fa6a7
diff --cc src/librbd/ImageCtx.h
index deca81d11b7b,c7b48a0e1d3c..c8efc0305fce
--- a/src/librbd/ImageCtx.h
+++ b/src/librbd/ImageCtx.h
@@@ -37,8 -36,10 +37,9 @@@ class PerfCounters
  namespace librbd {
  
    class AsyncOperation;
+   class AsyncRequest;
    class CopyupRequest;
    class ImageWatcher;
 -  class ObjectMap;
  
    struct ImageCtx {
      CephContext *cct;
@@@ -119,8 -113,10 +120,10 @@@
      std::map<uint64_t, CopyupRequest*> copyup_list;
  
      xlist<AsyncOperation*> async_ops;
+     xlist<AsyncRequest*> async_requests;
+     Cond async_requests_cond;
  
 -    ObjectMap *object_map;
 +    ObjectMap object_map;
  
      atomic_t async_request_seq;