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

librbd: better handling for async maintenance requests

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

diff --cc src/librbd/AsyncFlattenRequest.cc
Simple merge

diff --cc src/librbd/AsyncTrimRequest.cc
Simple merge

diff --cc src/librbd/ImageCtx.cc
Simple merge

diff --cc src/librbd/ImageCtx.h
index deca81d11b7b0455359657e5438c372b98cf2db8,c7b48a0e1d3c12df20a9afe94ee46b110c41acc8..c8efc0305fce220b1e078cfe5387270fe67af9d4
--- 1/src/librbd/ImageCtx.h
--- 2/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;
  

diff --cc src/librbd/ImageWatcher.cc
Simple merge

diff --cc src/librbd/internal.cc
Simple merge