]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #28402 from tchaikov/wip-crimson-cleanup
authorKefu Chai <kchai@redhat.com>
Thu, 6 Jun 2019 01:52:34 +0000 (09:52 +0800)
committerGitHub <noreply@github.com>
Thu, 6 Jun 2019 01:52:34 +0000 (09:52 +0800)
crimson/osd: some cleanups

Reviewed-by: Samuel Just <sjust@redhat.com>
1  2 
src/crimson/osd/osd.cc
src/crimson/osd/pg.h

Simple merge
index 109a09ee8d5c74f67b19303696f851fea7d30f1a,d691200e07610975c7c60f6ffc9a0aaa1de92a19..a0098e3b3f9f1493479c70eec72c088fb758cf03
@@@ -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(