]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #11288 from stiopaa1/osd_replicatedpg_moveCOSDOnAppliedClass
authorSage Weil <sage@redhat.com>
Mon, 3 Oct 2016 14:26:03 +0000 (09:26 -0500)
committerGitHub <noreply@github.com>
Mon, 3 Oct 2016 14:26:03 +0000 (09:26 -0500)
osd/ReplicatedPG:move C_OSD_OnApplied class to cc

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/ReplicatedPG.h

index f3a1dd07047b1c2214ad1826c13ab52e1c572876,219f42bef77f042ed86ac62153e8d5a3c7608748..96b07f52747f2a11a8180734b65d0cda96864d46
@@@ -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,