From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 24 Feb 2017 13:50:41 +0000 (-0500)
Subject: Merge pull request #12102 from yangdongsheng/async_remove
X-Git-Tag: v12.0.1~282
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3cd180b28b9597b016e5060559a6da653a38ca3c;p=ceph.git

Merge pull request #12102 from yangdongsheng/async_remove

librbd: asynchronous image removal state machine

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

3cd180b28b9597b016e5060559a6da653a38ca3c
diff --cc src/librbd/operation/DisableFeaturesRequest.h
index 7674dfc45ff8,436e30a13404..623eb1f87dca
--- a/src/librbd/operation/DisableFeaturesRequest.h
+++ b/src/librbd/operation/DisableFeaturesRequest.h
@@@ -26,15 -26,15 +26,15 @@@ public
    }
  
    DisableFeaturesRequest(ImageCtxT &image_ctx, Context *on_finish,
-                          uint64_t journal_op_tid, uint64_t features);
+                          uint64_t journal_op_tid, uint64_t features, bool force);
  
  protected:
 -  virtual void send_op();
 -  virtual bool should_complete(int r);
 -  virtual bool can_affect_io() const override {
 +  void send_op() override;
 +  bool should_complete(int r) override;
 +  bool can_affect_io() const override {
      return true;
    }
 -  virtual journal::Event create_event(uint64_t op_tid) const {
 +  journal::Event create_event(uint64_t op_tid) const override {
      return journal::UpdateFeaturesEvent(op_tid, m_features, false);
    }