From: Kefu Chai <kchai@redhat.com>
Date: Thu, 6 Jun 2019 01:52:34 +0000 (+0800)
Subject: Merge pull request #28402 from tchaikov/wip-crimson-cleanup
X-Git-Tag: v15.1.0~2544
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=848c40a0aaeed14f8ac32851be822841a7aa654d;p=ceph.git

Merge pull request #28402 from tchaikov/wip-crimson-cleanup

crimson/osd: some cleanups

Reviewed-by: Samuel Just <sjust@redhat.com>
---

848c40a0aaeed14f8ac32851be822841a7aa654d
diff --cc src/crimson/osd/pg.h
index 109a09ee8d5,d691200e076..a0098e3b3f9
--- a/src/crimson/osd/pg.h
+++ b/src/crimson/osd/pg.h
@@@ -385,11 -385,8 +385,8 @@@ public
      bool backfill,
      ObjectStore::Transaction &t);
  
 -  seastar::future<> read_state(ceph::os::CyanStore* store);
 +  seastar::future<> read_state(ceph::os::FuturizedStore* store);
  
-   void do_peering_event(
-     const boost::statechart::event_base &evt,
-     PeeringCtx &rctx);
    void do_peering_event(
      PGPeeringEvent& evt, PeeringCtx &rctx);
    void do_peering_event(