From: Sage Weil <sage@redhat.com>
Date: Mon, 3 Oct 2016 14:26:03 +0000 (-0500)
Subject: Merge pull request #11288 from stiopaa1/osd_replicatedpg_moveCOSDOnAppliedClass
X-Git-Tag: v11.0.1~42
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8242afb135101c213739beef55671ac89083147a;p=ceph.git

Merge pull request #11288 from stiopaa1/osd_replicatedpg_moveCOSDOnAppliedClass

osd/ReplicatedPG:move C_OSD_OnApplied class to cc

Reviewed-by: Sage Weil <sage@redhat.com>
---

8242afb135101c213739beef55671ac89083147a
diff --cc src/osd/ReplicatedPG.h
index f3a1dd07047b,219f42bef77f..96b07f52747f
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@@ -343,24 -340,9 +343,9 @@@ public
      append_log(logv, trim_to, trim_rollback_to, t, transaction_applied);
    }
  
-   struct C_OSD_OnApplied : Context {
-     ReplicatedPGRef pg;
-     epoch_t epoch;
-     eversion_t v;
-     C_OSD_OnApplied(
-       ReplicatedPGRef pg,
-       epoch_t epoch,
-       eversion_t v)
-       : pg(pg), epoch(epoch), v(v) {}
-     void finish(int) override {
-       pg->lock();
-       if (!pg->pg_has_reset_since(epoch))
- 	pg->op_applied(v);
-       pg->unlock();
-     }
-   };
+   struct C_OSD_OnApplied;
    void op_applied(
 -    const eversion_t &applied_version);
 +    const eversion_t &applied_version) override;
  
    bool should_send_op(
      pg_shard_t peer,