From: Sage Weil <sage@redhat.com>
Date: Tue, 30 Oct 2018 22:36:55 +0000 (-0500)
Subject: Merge PR #19411 into master
X-Git-Tag: v14.1.0~1032
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bf49b87ff91689ab3372867dd7362b618cbdae5b;p=ceph.git

Merge PR #19411 into master

* refs/pull/19411/head:
	osd: Step down RecoveryCtx from class to struct

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

bf49b87ff91689ab3372867dd7362b618cbdae5b
diff --cc src/osd/PG.h
index bde7a1270bc9,3f6cde71623d..817801b7859e
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@@ -253,12 -254,15 +253,12 @@@ public
    const spg_t pg_id;
    const coll_t coll;
  
 -  // for ordering writes
 -  ceph::shared_ptr<ObjectStore::Sequencer> osr;
 -
    ObjectStore::CollectionHandle ch;
  
-   class RecoveryCtx;
+   struct RecoveryCtx;
  
    // -- methods --
 -  std::string gen_prefix() const override;
 +  std::ostream& gen_prefix(std::ostream& out) const override;
    CephContext *get_cct() const override {
      return cct;
    }