Merge PR #19411 into master

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

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

diff --cc src/osd/PG.h
index bde7a1270bc9b8c0c837f455f6e1ff4566732dd5,3f6cde71623dd0bbebfa3305379b224fe4b5a293..817801b7859e9be75d7de7c047fc50cebd8fd399
--- 1/src/osd/PG.h
--- 2/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;
    }